diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2017-06-02 20:27:15 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2017-06-02 20:27:15 (GMT) |
commit | 3ff49a3711ee0106ea335cfef8f20794cfde2e72 (patch) | |
tree | 3a8130dcdce2ff585942313b08d97df0010eda26 | |
parent | 2607f751d363630b0475d2442c7853cc99dd3a8a (diff) | |
parent | 9e705cdcdbbbbd099f9348ccc70d78088f157d0c (diff) | |
download | hdf5-3ff49a3711ee0106ea335cfef8f20794cfde2e72.zip hdf5-3ff49a3711ee0106ea335cfef8f20794cfde2e72.tar.gz hdf5-3ff49a3711ee0106ea335cfef8f20794cfde2e72.tar.bz2 |
Merge pull request #562 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_8 to hdf5_1_8
* commit '9e705cdcdbbbbd099f9348ccc70d78088f157d0c':
Propagate .so number changes to Makefile.ins with bin/reconfigure.
-rw-r--r-- | c++/src/Makefile.in | 10 | ||||
-rwxr-xr-x | configure | 19 | ||||
-rw-r--r-- | fortran/src/Makefile.in | 10 | ||||
-rw-r--r-- | hl/c++/src/Makefile.in | 10 | ||||
-rw-r--r-- | hl/fortran/src/Makefile.in | 10 | ||||
-rw-r--r-- | hl/src/Makefile.in | 10 | ||||
-rw-r--r-- | src/Makefile.in | 10 |
7 files changed, 43 insertions, 36 deletions
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 0a6e517..6f1bc29 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -680,10 +680,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # See libtool versioning documentation online. # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. -LT_VERS_INTERFACE = 12 -LT_VERS_REVISION = 1 -LT_VERS_AGE = 2 -LT_CXX_VERS_INTERFACE = 13 +LT_VERS_INTERFACE = 13 +LT_VERS_REVISION = 0 +LT_VERS_AGE = 3 +LT_CXX_VERS_INTERFACE = 14 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 LT_F_VERS_INTERFACE = 10 @@ -699,7 +699,7 @@ LT_HL_F_VERS_INTERFACE = 10 LT_HL_F_VERS_REVISION = 3 LT_HL_F_VERS_AGE = 0 LT_TOOLS_VERS_INTERFACE = 10 -LT_TOOLS_VERS_REVISION = 4 +LT_TOOLS_VERS_REVISION = 5 LT_TOOLS_VERS_AGE = 0 # This is our main target @@ -7703,14 +7703,13 @@ if test "X${HDF_FORTRAN}" = "Xyes" && test "X${enable_shared}" != "Xno"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if shared Fortran libraries are supported" >&5 $as_echo_n "checking if shared Fortran libraries are supported... " >&6; } H5_FORTRAN_SHARED="yes" - - ## Disable fortran shared libraries on Mac. (MAM - 03/30/11) - + ## tell libtool to do the right thing with COMMON symbols, this fixes + ## corrupt values with COMMON and EQUIVALENCE when building shared + ## Fortran libraries on OSX with gnu and Intel compilers (HDFFV-2772). case "`uname`" in Darwin*) - H5_FORTRAN_SHARED="no" - CHECK_WARN="Shared Fortran libraries not currently supported on Mac." - ;; + H5_LDFLAGS="$H5_LDFLAGS -Wl,-commons,use_dylibs" + ;; esac ## Report results of check(s) @@ -33688,6 +33687,14 @@ chmod 755 tools/misc/h5cc if test "X$HDF_FORTRAN" = "Xyes"; then chmod 755 fortran/src/h5fc + ## libtool does not pass the correct argument linker (wl=) for the Intel Fortran compiler + ## on OS X, which is needed when building shared libraries on OS X. This script + ## replaces the 3rd occurrence, which is for Fortran, of wl="" with wl="-Wl," (HDFFV-2772) + case "`uname`" in + Darwin*) + cat libtool | awk '/wl=\"/{c++;if(c==3){sub("wl=\"\"","wl=\"-Wl,\"");c=0}}1' > libtool.tmp && mv -f libtool.tmp libtool && chmod 755 libtool + ;; + esac fi if test "X$HDF_CXX" = "Xyes"; then diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index da3757a..5144906 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -732,10 +732,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # See libtool versioning documentation online. # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. -LT_VERS_INTERFACE = 12 -LT_VERS_REVISION = 1 -LT_VERS_AGE = 2 -LT_CXX_VERS_INTERFACE = 13 +LT_VERS_INTERFACE = 13 +LT_VERS_REVISION = 0 +LT_VERS_AGE = 3 +LT_CXX_VERS_INTERFACE = 14 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 LT_F_VERS_INTERFACE = 10 @@ -751,7 +751,7 @@ LT_HL_F_VERS_INTERFACE = 10 LT_HL_F_VERS_REVISION = 3 LT_HL_F_VERS_AGE = 0 LT_TOOLS_VERS_INTERFACE = 10 -LT_TOOLS_VERS_REVISION = 4 +LT_TOOLS_VERS_REVISION = 5 LT_TOOLS_VERS_AGE = 0 AM_FCLIBS = $(LIBHDF5) diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 66026cd..2366700 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -671,10 +671,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # See libtool versioning documentation online. # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. -LT_VERS_INTERFACE = 12 -LT_VERS_REVISION = 1 -LT_VERS_AGE = 2 -LT_CXX_VERS_INTERFACE = 13 +LT_VERS_INTERFACE = 13 +LT_VERS_REVISION = 0 +LT_VERS_AGE = 3 +LT_CXX_VERS_INTERFACE = 14 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 LT_F_VERS_INTERFACE = 10 @@ -690,7 +690,7 @@ LT_HL_F_VERS_INTERFACE = 10 LT_HL_F_VERS_REVISION = 3 LT_HL_F_VERS_AGE = 0 LT_TOOLS_VERS_INTERFACE = 10 -LT_TOOLS_VERS_REVISION = 4 +LT_TOOLS_VERS_REVISION = 5 LT_TOOLS_VERS_AGE = 0 # This is our main target diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index b78190d..42d9d2e 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -689,10 +689,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # See libtool versioning documentation online. # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. -LT_VERS_INTERFACE = 12 -LT_VERS_REVISION = 1 -LT_VERS_AGE = 2 -LT_CXX_VERS_INTERFACE = 13 +LT_VERS_INTERFACE = 13 +LT_VERS_REVISION = 0 +LT_VERS_AGE = 3 +LT_CXX_VERS_INTERFACE = 14 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 LT_F_VERS_INTERFACE = 10 @@ -708,7 +708,7 @@ LT_HL_F_VERS_INTERFACE = 10 LT_HL_F_VERS_REVISION = 3 LT_HL_F_VERS_AGE = 0 LT_TOOLS_VERS_INTERFACE = 10 -LT_TOOLS_VERS_REVISION = 4 +LT_TOOLS_VERS_REVISION = 5 LT_TOOLS_VERS_AGE = 0 # Our main target, the high-level fortran library diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index c156187..212775d 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -670,10 +670,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # See libtool versioning documentation online. # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. -LT_VERS_INTERFACE = 12 -LT_VERS_REVISION = 1 -LT_VERS_AGE = 2 -LT_CXX_VERS_INTERFACE = 13 +LT_VERS_INTERFACE = 13 +LT_VERS_REVISION = 0 +LT_VERS_AGE = 3 +LT_CXX_VERS_INTERFACE = 14 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 LT_F_VERS_INTERFACE = 10 @@ -689,7 +689,7 @@ LT_HL_F_VERS_INTERFACE = 10 LT_HL_F_VERS_REVISION = 3 LT_HL_F_VERS_AGE = 0 LT_TOOLS_VERS_INTERFACE = 10 -LT_TOOLS_VERS_REVISION = 4 +LT_TOOLS_VERS_REVISION = 5 LT_TOOLS_VERS_AGE = 0 # This library is our main target. diff --git a/src/Makefile.in b/src/Makefile.in index f57a2f9..847a245 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -728,10 +728,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # See libtool versioning documentation online. # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. -LT_VERS_INTERFACE = 12 -LT_VERS_REVISION = 1 -LT_VERS_AGE = 2 -LT_CXX_VERS_INTERFACE = 13 +LT_VERS_INTERFACE = 13 +LT_VERS_REVISION = 0 +LT_VERS_AGE = 3 +LT_CXX_VERS_INTERFACE = 14 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 LT_F_VERS_INTERFACE = 10 @@ -747,7 +747,7 @@ LT_HL_F_VERS_INTERFACE = 10 LT_HL_F_VERS_REVISION = 3 LT_HL_F_VERS_AGE = 0 LT_TOOLS_VERS_INTERFACE = 10 -LT_TOOLS_VERS_REVISION = 4 +LT_TOOLS_VERS_REVISION = 5 LT_TOOLS_VERS_AGE = 0 # Our main target, the HDF5 library |