parallel-netcdf

- build-script reviewed
- variant for version 1.9.0 with pgi/18.5, pgi-mpi/18.5, hdf5/1.10.1 added

HDF5/parallel-netcdf/1/variants

@@ -1,2 +1,3 @@
 parallel-netcdf/1.9.0	unstable	gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1
 parallel-netcdf/1.9.0	unstable	gcc/7.3.0 openmpi/3.0.1  hdf5/1.10.1
+parallel-netcdf/1.9.0	unstable	pgi/18.5  pgi-mpi/18.5   hdf5/1.10.1

HDF5/parallel-netcdf/build

@@ -1,23 +1,36 @@
 #!/usr/bin/env modbuild
 
-pbuild::add_to_group 'HDF5'
 pbuild::set_download_url "http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/$P-$V.tar.gz"
-pbuild::set_docfiles \
-	AUTHORS  \
-	COPYING \
-	COPYRIGHT \
-	CREDITS \
-	ChangeLog \
-	NEWS \
-	RELEASE_NOTES
 
-pbuild::configure() {
+pbuild::add_to_group 'HDF5'
-	"${SRC_DIR}"/configure \
+
-		--prefix="${PREFIX}" \
+pbuild::add_docfiles 'AUTHORS' 'CREDITS'
-		--with-mpi="${OPENMPI_DIR}" \
+pbuild::add_docfiles 'COPYING' 'COPYRIGHT'
-		--with-pic \
+pbuild::add_docfiles 'ChangeLog' 'NEWS'
-		--disable-shared \
+pbuild::add_docfiles 'RELEASE_NOTES'
-		|| exit 1
+
+pbuild::pre_configure() {
+	pbuild::add_configure_args "--with-mpi=${MPICC/bin\/*}"
+	pbuild::add_configure_args "--with-pic"
+	pbuild::add_configure_args "--disable-shared"
+	case "${COMPILER}" in
+		pgi )
+			# PGI uses GCC's include files, some object files and
+			# the STL implementation!
+			# The PGI C pre-processor is broken and doesn't work 
+			# for HDF5. We use the pre-processor of the underlying
+			# GCC...
+			# This is a bit hackish!
+			#
+			# The following eval sets GCCDIR! Which is something 
+			# like:
+			# /opt/psi/Programming/gcc/7.3.0/bin/../lib/gcc/x86_64-pc-linux-gnu/7.3.0
+			#
+			eval $(pgcc -show 2>/dev/null | \
+				awk '/^GCCDIR[[:space:]]*=/{gsub(/[[:space:]]/,""); print $0}')
+			pbuild::add_configure_args "CPP=${GCCDIR%%/..*}/cpp"
+			;;
+	esac
 }
 
 pbuild::make_all