[hdf5/f16] Add patch to avoid setting LD_LIBRARY_PATH

[Orion Poplawski]

commit 8b0a6d6393d1eccdcdc3f100d08f6d0b686215d2
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Nov 25 18:13:10 2011 -0700

    Add patch to avoid setting LD_LIBRARY_PATH

 hdf5-LD_LIBRARY_PATH.patch |   33 +++++++++++++++++++++++++++++++++
 hdf5.spec                  |    3 +++
 2 files changed, 36 insertions(+), 0 deletions(-)
---
diff --git a/hdf5-LD_LIBRARY_PATH.patch b/hdf5-LD_LIBRARY_PATH.patch
new file mode 100644
index 0000000..da8a390
--- /dev/null
+++ b/hdf5-LD_LIBRARY_PATH.patch
@@ -0,0 +1,33 @@
+diff -up hdf5-1.8.8/configure.LD_LIBRARY_PATH hdf5-1.8.8/configure
+--- hdf5-1.8.8/configure.LD_LIBRARY_PATH	2011-11-16 11:21:54.511269486 -0700
++++ hdf5-1.8.8/configure	2011-11-16 11:28:18.673392600 -0700
+@@ -26746,8 +26746,6 @@ $as_echo_n "checking how to print long l
+ if ${hdf5_cv_printf_ll+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $AM_LDFLAGS $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`"
+-export LD_LIBRARY_PATH
+ 
+ for hdf5_cv_printf_ll in l ll L q unknown; do
+    if test "$cross_compiling" = yes; then :
+diff -up hdf5-1.8.8/src/Makefile.in.LD_LIBRARY_PATH hdf5-1.8.8/src/Makefile.in
+--- hdf5-1.8.8/src/Makefile.in.LD_LIBRARY_PATH	2011-11-15 08:13:54.000000000 -0700
++++ hdf5-1.8.8/src/Makefile.in	2011-11-16 11:43:42.938914069 -0700
+@@ -1267,8 +1267,6 @@ help:
+ # Remove the generated .c file if errors occur unless HDF5_Make_Ignore
+ # is set to ignore the error.
+ H5Tinit.c: H5detect$(EXEEXT)
+-	LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) |                  \
+-		sed -e 's/-L/:/g' -e 's/ //g'`"                               \
+ 	$(RUNSERIAL) ./H5detect$(EXEEXT) > $@  ||                               \
+ 	    (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||          \
+ 	    ($(RM) $@ ; exit 1)
+@@ -1279,8 +1277,6 @@ H5Tinit.c: H5detect$(EXEEXT)
+ # Remove the generated .c file if errors occur unless HDF5_Make_Ignore
+ # is set to ignore the error.
+ H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings
+-	LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) |                  \
+-		sed -e 's/-L/:/g' -e 's/ //g'`"                               \
+ 	$(RUNSERIAL) ./H5make_libsettings$(EXEEXT) > $@  ||                               \
+ 	    (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||          \
+ 	    ($(RM) $@ ; exit 1)
diff --git a/hdf5.spec b/hdf5.spec
index 49adb22..f57f021 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -11,6 +11,7 @@ Group: System Environment/Libraries
 URL: http://www.hdfgroup.org/HDF5/
 Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}.tar.bz2
 Source1: h5comp
+Patch0: hdf5-LD_LIBRARY_PATH.patch
 Patch4: hdf5-1.8.6-tstlite.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
@@ -129,6 +130,7 @@ HDF5 parallel openmpi static libraries
 %prep
 #setup -q -n %{name}-%{version}%{?snaprel}
 %setup -q
+%patch0 -p1 -b .LD_LIBRARY_PATH
 %patch4 -p1 -b .tstlite
 #This should be fixed in 1.8.7
 find \( -name '*.[ch]*' -o -name '*.f90' -o -name '*.txt' \) -exec chmod -x {} +
@@ -379,6 +381,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Nov 18 2011 Orion Poplawski <orion at cora.nwra.com> 1.8.7-3
 - Add rpm macro %%{_hdf5_version} for convenience
 - Enable static MPI builds
+- Add patch to avoid setting LD_LIBRARY_PATH
 
 * Wed Jun 01 2011 Karsten Hopp <karsten at redhat.com> 1.8.7-2
 - drop ppc64 longdouble patch, not required anymore