diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-07-23 20:04:18 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-07-23 20:04:18 (GMT) |
| commit | 6a00b1b6ffe86872088f92f38c98ccd6599d3c6c (patch) | |
| tree | bab50938ed33e313d37c381b1769ff2a95f15502 /tools/h5import/Makefile.in | |
| parent | 3a8bce5cb845685b9cfb7267ad6addc155dea567 (diff) | |
| download | hdf5-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/h5import/Makefile.in')
| -rwxr-xr-x | tools/h5import/Makefile.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 9314d90..938a8dd 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -71,6 +71,9 @@ h5import_SOURCES = h5import.c h5import_OBJECTS = h5import.$(OBJEXT) h5import_LDADD = $(LDADD) h5import_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) +h5import_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5import_LDFLAGS) \ + $(LDFLAGS) -o $@ h5importtest_SOURCES = h5importtest.c h5importtest_OBJECTS = h5importtest.$(OBJEXT) h5importtest_LDADD = $(LDADD) @@ -350,6 +353,9 @@ TEST_SCRIPT = $(srcdir)/h5importtestutil.sh check_SCRIPT = h5importtestutil.sh SCRIPT_DEPEND = h5import$(EXEEXT) +# Add h5import specific linker flags here +h5import_LDFLAGS = $(LT_STATIC_EXEC) + # All programs depend on the main hdf5 library and the tools library LDADD = $(LIBH5TOOLS) $(LIBHDF5) @@ -438,7 +444,7 @@ clean-checkPROGRAMS: done h5import$(EXEEXT): $(h5import_OBJECTS) $(h5import_DEPENDENCIES) @rm -f h5import$(EXEEXT) - $(LINK) $(h5import_OBJECTS) $(h5import_LDADD) $(LIBS) + $(h5import_LINK) $(h5import_OBJECTS) $(h5import_LDADD) $(LIBS) h5importtest$(EXEEXT): $(h5importtest_OBJECTS) $(h5importtest_DEPENDENCIES) @rm -f h5importtest$(EXEEXT) $(LINK) $(h5importtest_OBJECTS) $(h5importtest_LDADD) $(LIBS) |