[svn-r11420] Purpose:

Bug fix

Description:
Disabled C++ shared libraries for Sun Workshop compiler.

Solution:
This bug only seems to happen when using the -xarch=v9 flag to compile in
64-bit mode, but disabling shared libraries entirely for this compiler is
an easier fix (I don't know how to detect 64 bit mode from the command line).
The framework for disabling shared libraries for other C++ compilers is
in place.

Platforms tested:
sol, mir, sleipnir, modi4

5 files changed, 24 insertions, 0 deletions

diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index debf475..9da9c36 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -115,6 +115,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@
+CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@
 CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am
index fb0681b..63e95b6 100644
--- a/hl/c++/src/Makefile.am
+++ b/hl/c++/src/Makefile.am
@@ -25,6 +25,12 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src
 # This is our main target
 lib_LTLIBRARIES=libhdf5_hl_cpp.la
 
+# Shared C++ libraries aren't universally supported.
+if CXX_SHARED_CONDITIONAL
+else
+  AM_LDFLAGS=-static
+endif
+
 # Source files for the library
 # At the moment, only the H5PT Packet Table has a C++ API.
 libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index ad39496..3026d44 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -137,6 +137,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@
+CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@
 CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
@@ -316,6 +318,9 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src
 # This is our main target
 lib_LTLIBRARIES = libhdf5_hl_cpp.la
 
+# Shared C++ libraries aren't universally supported.
+@CXX_SHARED_CONDITIONAL_FALSE@AM_LDFLAGS = -static
+
 # Source files for the library
 # At the moment, only the H5PT Packet Table has a C++ API.
 libhdf5_hl_cpp_la_SOURCES = H5PacketTable.cpp
diff --git a/hl/c++/test/Makefile.am b/hl/c++/test/Makefile.am
index 0eee1c1..d438e41 100644
--- a/hl/c++/test/Makefile.am
+++ b/hl/c++/test/Makefile.am
@@ -22,6 +22,12 @@ include $(top_srcdir)/config/commence.am
 # Include directories
 INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test
 
+# Shared C++ libraries aren't universally supported.
+if CXX_SHARED_CONDITIONAL
+else
+  AM_LDFLAGS=-static
+endif
+
 # These are our main targets.  They should be listed in the order to be
 # executed, generally most specific tests to least specific tests.
 TEST_PROG=ptableTest
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index 6b544f9..1029002 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -131,6 +131,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
+CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@
+CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@
 CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
@@ -307,6 +309,9 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Include directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test
 
+# Shared C++ libraries aren't universally supported.
+@CXX_SHARED_CONDITIONAL_FALSE@AM_LDFLAGS = -static
+
 # These are our main targets.  They should be listed in the order to be
 # executed, generally most specific tests to least specific tests.
 TEST_PROG = ptableTest