From 5b4232e9d164434e422bdd72199f39507af984d8 Mon Sep 17 00:00:00 2001 From: James Laird Date: Mon, 28 Feb 2005 17:54:17 -0500 Subject: [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 --- fortran/src/Makefile.am | 6 +++--- fortran/src/Makefile.in | 7 ++++--- fortran/test/Makefile.am | 6 +++--- fortran/test/Makefile.in | 7 ++++--- fortran/testpar/Makefile.am | 3 +++ fortran/testpar/Makefile.in | 3 +++ hl/fortran/src/Makefile.am | 6 +++--- hl/fortran/src/Makefile.in | 7 ++++--- hl/fortran/test/Makefile.am | 3 +++ hl/fortran/test/Makefile.in | 3 +++ 10 files changed, 33 insertions(+), 18 deletions(-) diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index b7445d4..351ecbd 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -24,12 +24,12 @@ include $(top_srcdir)/config/commence.am INCLUDES = -I$(top_srcdir)/src AM_FFLAGS=-I$(top_srcdir)/src +# Fortran libraries are linked statically to solve a build problem. +AM_LDFLAGS=-static + # This is our main target, the fortran library lib_LTLIBRARIES=libhdf5_fortran.la -# Fortran library is linked statically to solve a build problem. -libhdf5_fortran_la_LDFLAGS=-static - # Include HDF5.f90 if parallel is disabled, HDF5mpiof* if parallel is enabled if BUILD_PARALLEL_CONDITIONAL PARALLEL_COND_SRC = H5FDmpiof.c HDF5mpio.f90 H5FDmpioff.f90 diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 4aba994..a737d0a 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -198,12 +198,12 @@ F9XMODFLAG = @F9XMODFLAG@ INCLUDES = -I$(top_srcdir)/src AM_FFLAGS = -I$(top_srcdir)/src +# Fortran libraries are linked statically to solve a build problem. +AM_LDFLAGS = -static + # This is our main target, the fortran library lib_LTLIBRARIES = libhdf5_fortran.la -# Fortran library is linked statically to solve a build problem. -libhdf5_fortran_la_LDFLAGS = -static - # Include HDF5.f90 if parallel is disabled, HDF5mpiof* if parallel is enabled @BUILD_PARALLEL_CONDITIONAL_TRUE@PARALLEL_COND_SRC = H5FDmpiof.c HDF5mpio.f90 H5FDmpioff.f90 @BUILD_PARALLEL_CONDITIONAL_FALSE@PARALLEL_COND_SRC = HDF5.f90 @@ -249,6 +249,7 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = h5fc H5fortran_types.f90 libhdf5_fortran.settings LTLIBRARIES = $(lib_LTLIBRARIES) +libhdf5_fortran_la_LDFLAGS = libhdf5_fortran_la_LIBADD = @BUILD_PARALLEL_CONDITIONAL_TRUE@am__objects_1 = H5FDmpiof.lo \ @BUILD_PARALLEL_CONDITIONAL_TRUE@ HDF5mpio.lo H5FDmpioff.lo diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am index b9f0b8d..ea9fd71 100644 --- a/fortran/test/Makefile.am +++ b/fortran/test/Makefile.am @@ -23,12 +23,12 @@ include $(top_srcdir)/config/commence.am AM_FFLAGS=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src INCLUDES=-I$(top_srcdir)/src +# Fortran libraries are linked statically to solve a build problem. +AM_LDFLAGS=-static + # The Fortran test library lib_LTLIBRARIES=libh5test_fortran.la -# Fortran library is linked statically to solve a build problem. -libh5test_fortran_la_LDFLAGS=-static - # Our main targets, the tests themselves TEST_PROG=fortranlib_test fflush1 fflush2 check_PROGRAMS=$(TEST_PROG) diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index d9ad763..f2fbab663 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -197,12 +197,12 @@ F9XMODFLAG = @F9XMODFLAG@ AM_FFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src INCLUDES = -I$(top_srcdir)/src +# Fortran libraries are linked statically to solve a build problem. +AM_LDFLAGS = -static + # The Fortran test library lib_LTLIBRARIES = libh5test_fortran.la -# Fortran library is linked statically to solve a build problem. -libh5test_fortran_la_LDFLAGS = -static - # Our main targets, the tests themselves TEST_PROG = fortranlib_test fflush1 fflush2 check_PROGRAMS = $(TEST_PROG) @@ -251,6 +251,7 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) +libh5test_fortran_la_LDFLAGS = libh5test_fortran_la_LIBADD = am_libh5test_fortran_la_OBJECTS = fortranlib_test.lo tH5F.lo tH5D.lo \ tH5R.lo tH5S.lo tH5T.lo tH5VL.lo tH5Z.lo tH5Sselect.lo tH5P.lo \ diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am index e6301d0..39aceb0 100644 --- a/fortran/testpar/Makefile.am +++ b/fortran/testpar/Makefile.am @@ -22,6 +22,9 @@ include $(top_srcdir)/config/commence.am # Include files AM_FFLAGS=-I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLAG)$(top_builddir)/fortran/src +# Fortran libraries are linked statically to solve a build problem. +AM_LDFLAGS=-static + # These are our main targets TEST_PROG_PARA=ptesthdf5_fortran check_PROGRAMS=$(TEST_PROG_PARA) diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 8ca8cf3..24bd5d6 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -196,6 +196,9 @@ F9XMODFLAG = @F9XMODFLAG@ # Include files AM_FFLAGS = -I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLAG)$(top_builddir)/fortran/src +# Fortran libraries are linked statically to solve a build problem. +AM_LDFLAGS = -static + # These are our main targets TEST_PROG_PARA = ptesthdf5_fortran check_PROGRAMS = $(TEST_PROG_PARA) 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) -- cgit v0.12