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 /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 'c++')
| -rw-r--r-- | c++/src/Makefile.am | 5 | ||||
| -rw-r--r-- | c++/src/Makefile.in | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am index 7c1f497..9ff2e66 100644 --- a/c++/src/Makefile.am +++ b/c++/src/Makefile.am @@ -47,8 +47,11 @@ libhdf5_cpp_la_SOURCES=H5Exception.cpp H5IdComponent.cpp H5Library.cpp \ H5StrType.cpp H5ArrayType.cpp H5VarLenType.cpp H5CompType.cpp \ H5DataSet.cpp H5CommonFG.cpp H5Group.cpp H5File.cpp -# HDF5 C++ library depends on HDF5 Library. +# HDF5 C++ library depends on HDF5 Library. However, only add the dependency +# if --enable-sharedlib-rpath is yes. +if LT_ADD_LIBHDF5_DEPENDENCY libhdf5_cpp_la_LIBADD=$(LIBHDF5) +endif # Public headers include_HEADERS=H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h \ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 37f49e0..c4e07c5 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -146,7 +146,8 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libhdf5_cpp_la_DEPENDENCIES = $(LIBHDF5) +@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5_cpp_la_DEPENDENCIES = \ +@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@ $(LIBHDF5) am_libhdf5_cpp_la_OBJECTS = H5Exception.lo H5IdComponent.lo \ H5Library.lo H5Attribute.lo H5Location.lo H5Object.lo \ H5PropList.lo H5FaccProp.lo H5FcreatProp.lo H5DcreatProp.lo \ @@ -703,8 +704,9 @@ libhdf5_cpp_la_SOURCES = H5Exception.cpp H5IdComponent.cpp H5Library.cpp H5DataSet.cpp H5CommonFG.cpp H5Group.cpp H5File.cpp -# HDF5 C++ library depends on HDF5 Library. -libhdf5_cpp_la_LIBADD = $(LIBHDF5) +# HDF5 C++ library depends on HDF5 Library. However, only add the dependency +# if --enable-sharedlib-rpath is yes. +@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5_cpp_la_LIBADD = $(LIBHDF5) # Public headers include_HEADERS = H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h \ |