resolve conflict

Compiler/hdf5_serial/1/variants

@@ -47,3 +47,9 @@ hdf5_serial/1.10.1	stable		gcc/4.9.4
 hdf5_serial/1.10.1	stable		gcc/5.4.0 
 hdf5_serial/1.10.1	stable		gcc/6.3.0
 hdf5_serial/1.10.1	stable		gcc/7.2.0
+
+hdf5_serial/1.10.1	unstable	intel/17.1
+hdf5_serial/1.10.1	stable		intel/17.4
+
+hdf5_serial/1.10.1	unstable	pgi/17.3
+hdf5_serial/1.10.1	unstable	pgi/17.7

Compiler/hdf5_serial/build

@@ -1,6 +1,11 @@
 #!/usr/bin/env modbuild
 
 pbuild::configure() {
+	test "$(basename "$CPP")" = "pgprepro" && {
+		CPP=cpp
+		CXX=g++
+		echo "INFO: substituted pgprepro with cpp, and pgc++ with g++!"
+	}
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-shared \

Compiler/openmpi/2.1/variants.Linux

@@ -1 +1,6 @@
+openmpi/2.1.1   stable          gcc/6.4.0
 openmpi/2.1.0	stable		gcc/7.1.0
+openmpi/2.1.1	stable		gcc/7.2.0
+
+openmpi/2.1.1   unstable        intel/17.1
+openmpi/2.1.1   stable          intel/17.4

Programming/gcc/6/variants

@@ -1,3 +1,4 @@
 gcc/6.1.0	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
 gcc/6.2.0	stable		b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
 gcc/6.3.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
+gcc/6.4.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3