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/c++ | |
| 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/c++')
| -rw-r--r-- | hl/c++/src/Makefile.am | 5 | ||||
| -rw-r--r-- | hl/c++/src/Makefile.in | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am index 6f5b045..03289c0 100644 --- a/hl/c++/src/Makefile.am +++ b/hl/c++/src/Makefile.am @@ -40,8 +40,11 @@ endif # At the moment, only the H5PT Packet Table has a C++ API. libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp -# HDF5 HL C++ library depends on HDF5 HL Library and HDF5 C++ Library. +# HDF5 HL C++ library depends on HDF5 Library. However, only add the dependency +# if --enable-sharedlib-rpath is yes. +if LT_ADD_LIBHDF5_DEPENDENCY libhdf5_hl_cpp_la_LIBADD=$(LIBH5_HL) $(LIBH5CPP) +endif # Public headers include_HEADERS=H5PacketTable.h diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 343edea..8f5c27f 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -144,7 +144,8 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libhdf5_hl_cpp_la_DEPENDENCIES = $(LIBH5_HL) $(LIBH5CPP) +@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5_hl_cpp_la_DEPENDENCIES = \ +@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@ $(LIBH5_HL) $(LIBH5CPP) am_libhdf5_hl_cpp_la_OBJECTS = H5PacketTable.lo libhdf5_hl_cpp_la_OBJECTS = $(am_libhdf5_hl_cpp_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -688,8 +689,9 @@ libhdf5_hl_cpp_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISIO # At the moment, only the H5PT Packet Table has a C++ API. libhdf5_hl_cpp_la_SOURCES = H5PacketTable.cpp -# HDF5 HL C++ library depends on HDF5 HL Library and HDF5 C++ Library. -libhdf5_hl_cpp_la_LIBADD = $(LIBH5_HL) $(LIBH5CPP) +# HDF5 HL C++ library depends on HDF5 Library. However, only add the dependency +# if --enable-sharedlib-rpath is yes. +@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5_hl_cpp_la_LIBADD = $(LIBH5_HL) $(LIBH5CPP) # Public headers include_HEADERS = H5PacketTable.h |