summaryrefslogtreecommitdiffstats
path: root/tools/h5repack
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2009-07-23 20:04:18 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2009-07-23 20:04:18 (GMT)
commit6a00b1b6ffe86872088f92f38c98ccd6599d3c6c (patch)
treebab50938ed33e313d37c381b1769ff2a95f15502 /tools/h5repack
parent3a8bce5cb845685b9cfb7267ad6addc155dea567 (diff)
downloadhdf5-6a00b1b6ffe86872088f92f38c98ccd6599d3c6c.zip
hdf5-6a00b1b6ffe86872088f92f38c98ccd6599d3c6c.tar.gz
hdf5-6a00b1b6ffe86872088f92f38c98ccd6599d3c6c.tar.bz2
[svn-r17228] Purpose:
Fix BZ #1583 Description: The --enable-static-exec flag was broken. Configure was adding the -all-static linker flag to an environment variable which was subsequently never used. (looks like it was used in 1.6 Makefile.ins, but never moved to 1.8's Makefile.ams when we added automake support). To fix, I've added this environment varibale to the link lines of all the tools. Now, when --enable-static-exec is invoked, it will correctly generate statically linked executables in the installed bin directory. Tested: I've tested manually to ensure that the generated execs are static when the flag is used and dynamic when not. I've also tested when szip is used, as this was a use case mentioned in the bug report. Also: ran full tests with make check on jam and smirom for good measure.
Diffstat (limited to 'tools/h5repack')
-rw-r--r--tools/h5repack/Makefile.am3
-rw-r--r--tools/h5repack/Makefile.in8
2 files changed, 10 insertions, 1 deletions
diff --git a/tools/h5repack/Makefile.am b/tools/h5repack/Makefile.am
index 2c0c0c2..1f811f0 100644
--- a/tools/h5repack/Makefile.am
+++ b/tools/h5repack/Makefile.am
@@ -36,6 +36,9 @@ SCRIPT_DEPEND=h5repack$(EXEEXT)
# Our main target, h5repack tool
bin_PROGRAMS=h5repack
+# Add h5repack specific linker flags here
+h5repack_LDFLAGS = $(LT_STATIC_EXEC)
+
# Depend on the hdf5 library, the tools library, the test library
LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 9b559ad..07f8110 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -76,6 +76,9 @@ am_h5repack_OBJECTS = $(am__objects_1) h5repack_main.$(OBJEXT)
h5repack_OBJECTS = $(am_h5repack_OBJECTS)
h5repack_LDADD = $(LDADD)
h5repack_DEPENDENCIES = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
+h5repack_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5repack_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_h5repacktst_OBJECTS = $(am__objects_1) h5repacktst.$(OBJEXT)
h5repacktst_OBJECTS = $(am_h5repacktst_OBJECTS)
h5repacktst_LDADD = $(LDADD)
@@ -367,6 +370,9 @@ TEST_PROG = h5repacktst
check_SCRIPTS = $(TEST_SCRIPT)
SCRIPT_DEPEND = h5repack$(EXEEXT)
+# Add h5repack specific linker flags here
+h5repack_LDFLAGS = $(LT_STATIC_EXEC)
+
# Depend on the hdf5 library, the tools library, the test library
LDADD = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
@@ -474,7 +480,7 @@ clean-noinstPROGRAMS:
done
h5repack$(EXEEXT): $(h5repack_OBJECTS) $(h5repack_DEPENDENCIES)
@rm -f h5repack$(EXEEXT)
- $(LINK) $(h5repack_OBJECTS) $(h5repack_LDADD) $(LIBS)
+ $(h5repack_LINK) $(h5repack_OBJECTS) $(h5repack_LDADD) $(LIBS)
h5repacktst$(EXEEXT): $(h5repacktst_OBJECTS) $(h5repacktst_DEPENDENCIES)
@rm -f h5repacktst$(EXEEXT)
$(LINK) $(h5repacktst_OBJECTS) $(h5repacktst_LDADD) $(LIBS)