diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2014-04-18 21:52:44 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2014-04-18 21:52:44 (GMT) |
commit | 10c13288b423cda2735f662b4677dbe9653610be (patch) | |
tree | 651561d4495002d0252dcdfe2ce65f7be7b89ccc /hl/fortran | |
parent | 19125219cdc58a1668ff46e572126c1c3e7c4f0b (diff) | |
download | hdf5-10c13288b423cda2735f662b4677dbe9653610be.zip hdf5-10c13288b423cda2735f662b4677dbe9653610be.tar.gz hdf5-10c13288b423cda2735f662b4677dbe9653610be.tar.bz2 |
[svn-r25068] Fix for HDFFV-8276, the --disable-sharedlib-rpath configure optino doesn't remove rpaths from th
e library files, was checked into trunk in September 2013, but not into the 1.8 branch. part of
the code was merged to v1.8 in the interim for fortran, but not for hl or c++. The rest is mer
ged in this revision.
The --disable-sharedlib-rpath option seems to have no effect on non-Linux platforms.
Tested with h5committest on jam, koala, ostrich and platypus.
Tested with --disble-sharedlib-rpath option on jam, platypus, emu and quail.
Absence of rpaths verified on jam and platypus.
Diffstat (limited to 'hl/fortran')
-rw-r--r-- | hl/fortran/src/Makefile.am | 5 | ||||
-rw-r--r-- | hl/fortran/src/Makefile.in | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am index 82e0cfd..5195371 100644 --- a/hl/fortran/src/Makefile.am +++ b/hl/fortran/src/Makefile.am @@ -49,8 +49,11 @@ endif libhdf5hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \ H5DSff.f90 H5LTff.f90 H5IMff.f90 H5TBff.f90 -# HDF5 HL Fortran library depends on HDF5 HL Library and HDF5 Fortran Library. +# HDF5 HL Fortran library depends on HDF5 Library. However, only add the dependency +# if --enable-sharedlib-rpath is yes. +if LT_ADD_LIBHDF5_DEPENDENCY libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F) +endif # Fortran module files can have different extensions and different names # (e.g., different capitalizations) on different platforms. Write rules diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 5dab193..3a9f04a 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -144,7 +144,8 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libhdf5hl_fortran_la_DEPENDENCIES = $(LIBH5_HL) $(LIBH5F) +@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5hl_fortran_la_DEPENDENCIES = \ +@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@ $(LIBH5_HL) $(LIBH5F) am_libhdf5hl_fortran_la_OBJECTS = H5DSfc.lo H5LTfc.lo H5IMfc.lo \ H5IMcc.lo H5TBfc.lo H5DSff.lo H5LTff.lo H5IMff.lo H5TBff.lo libhdf5hl_fortran_la_OBJECTS = $(am_libhdf5hl_fortran_la_OBJECTS) @@ -709,8 +710,9 @@ libhdf5hl_fortran_la_SOURCES = H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \ H5DSff.f90 H5LTff.f90 H5IMff.f90 H5TBff.f90 -# HDF5 HL Fortran library depends on HDF5 HL Library and HDF5 Fortran Library. -libhdf5hl_fortran_la_LIBADD = $(LIBH5_HL) $(LIBH5F) +# HDF5 HL Fortran library depends on HDF5 Library. However, only add the dependency +# if --enable-sharedlib-rpath is yes. +@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5hl_fortran_la_LIBADD = $(LIBH5_HL) $(LIBH5F) # Automake needs to be taught how to build lib, progs, and tests targets. # These will be filled in automatically for the most part (e.g., |