diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-02-28 22:54:17 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-02-28 22:54:17 (GMT) |
| commit | 5b4232e9d164434e422bdd72199f39507af984d8 (patch) | |
| tree | f872924dd1d0d6f1059cf99a48317933b341286b /hl/fortran | |
| parent | 08bce1b7d2969ccb08ad4ba963ec6f17f57e9728 (diff) | |
| download | hdf5-5b4232e9d164434e422bdd72199f39507af984d8.zip hdf5-5b4232e9d164434e422bdd72199f39507af984d8.tar.gz hdf5-5b4232e9d164434e422bdd72199f39507af984d8.tar.bz2 | |
[svn-r10107] Purpose:
Bug fix
Description:
Fortran builds were dying with unknown flags.
Solution:
Fortran builds should be static, not shared. Static flags had been specified
for libraries, but apparently were also needed for executables.
Solved problem by adding static flag to everything in fortran directories.
Platforms tested:
mir, eirene
Diffstat (limited to 'hl/fortran')
| -rw-r--r-- | hl/fortran/src/Makefile.am | 6 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.in | 7 | ||||
| -rw-r--r-- | hl/fortran/test/Makefile.am | 3 | ||||
| -rw-r--r-- | hl/fortran/test/Makefile.in | 3 |
4 files changed, 13 insertions, 6 deletions
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am index 994ccaa..cca6147 100644 --- a/hl/fortran/src/Makefile.am +++ b/hl/fortran/src/Makefile.am @@ -14,12 +14,12 @@ include $(top_srcdir)/config/commence.am AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src AM_FFLAGS=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src +# Fortran libraries are linked statically to solve a build problem. +AM_LDFLAGS=-static + # Our main target, the high-level fortran library lib_LTLIBRARIES=libhdf5hl_fortran.la -# Fortran library is linked statically to solve a build problem. -libhdf5hl_fortran_la_LDFLAGS=-static - # Source files for the library if BUILD_PARALLEL_CONDITIONAL PARALLEL_COND_SRC=HDFDmpiof.c HDF5mpio.f90 diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 1bfc4f7..1256df9 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -187,12 +187,12 @@ F9XMODFLAG = @F9XMODFLAG@ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src AM_FFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src +# Fortran libraries are linked statically to solve a build problem. +AM_LDFLAGS = -static + # Our main target, the high-level fortran library lib_LTLIBRARIES = libhdf5hl_fortran.la -# Fortran library is linked statically to solve a build problem. -libhdf5hl_fortran_la_LDFLAGS = -static - # Source files for the library @BUILD_PARALLEL_CONDITIONAL_TRUE@PARALLEL_COND_SRC = HDFDmpiof.c HDF5mpio.f90 @@ -220,6 +220,7 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) +libhdf5hl_fortran_la_LDFLAGS = libhdf5hl_fortran_la_DEPENDENCIES = $(top_builddir)/hl/src/libhdf5_hl.la am_libhdf5hl_fortran_la_OBJECTS = H5LTfc.lo H5IMfc.lo H5TBfc.lo \ H5LTff.lo H5IMff.lo H5TBff.lo diff --git a/hl/fortran/test/Makefile.am b/hl/fortran/test/Makefile.am index 0e8fedf..3aee165 100644 --- a/hl/fortran/test/Makefile.am +++ b/hl/fortran/test/Makefile.am @@ -14,6 +14,9 @@ include $(top_srcdir)/config/commence.am AM_CPPFLAGS=-I$(top_srcdir)/src $(top_builddir)/src AM_FFLAGS=-I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/hl/fortran/src +# Fortran libraries are linked statically to solve a build problem. +AM_LDFLAGS=-static + # Our main target, the test programs TEST_PROG=tstlite tstimage tsttable check_PROGRAMS=$(TEST_PROG) diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index f41e777..af39d73 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -187,6 +187,9 @@ F9XMODFLAG = @F9XMODFLAG@ AM_CPPFLAGS = -I$(top_srcdir)/src $(top_builddir)/src AM_FFLAGS = -I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/hl/fortran/src +# Fortran libraries are linked statically to solve a build problem. +AM_LDFLAGS = -static + # Our main target, the test programs TEST_PROG = tstlite tstimage tsttable check_PROGRAMS = $(TEST_PROG) |