mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-02-17 16:10:24 +08:00
[svn-r10098] Purpose:
Bug fix Description: Some machines and compilers were having trouble creating fortran libraries as shared libraries. Solution: Added flag in Makefiles.am to create fortran libraries as shared libraries. (This is how HDF5 was set up before automake changes; I forgot to add these flags, and it didn't cause a problem until now.) Platforms tested: sleipnir, eirene, verbena Misc. update:
This commit is contained in:
parent
a9b7b7d971
commit
d7883f21bf
@ -27,7 +27,7 @@ AM_FFLAGS=-I$(top_srcdir)/src
|
||||
# This is our main target, the fortran library
|
||||
lib_LTLIBRARIES=libhdf5_fortran.la
|
||||
|
||||
# DEBUG - will linking statically solve fortran build problem?
|
||||
# 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
|
||||
|
@ -201,7 +201,7 @@ AM_FFLAGS = -I$(top_srcdir)/src
|
||||
# This is our main target, the fortran library
|
||||
lib_LTLIBRARIES = libhdf5_fortran.la
|
||||
|
||||
# DEBUG - will linking statically solve fortran build problem?
|
||||
# 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
|
||||
|
@ -26,6 +26,9 @@ INCLUDES=-I$(top_srcdir)/src
|
||||
# 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)
|
||||
@ -34,8 +37,6 @@ libh5test_fortran_la_SOURCES=fortranlib_test.f90 tH5F.f90 tH5D.f90 \
|
||||
tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90 tH5Sselect.f90 \
|
||||
tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tf.f90 t.c
|
||||
|
||||
libh5test_fortran_la_LDFLAGS=-static
|
||||
|
||||
# Source files are used for both the library and fortranlib_test.
|
||||
# Automake will complain about this without the following workaround.
|
||||
fortranlib_test_FFLAGS=$(AM_FFLAGS)
|
||||
|
@ -200,6 +200,9 @@ INCLUDES = -I$(top_srcdir)/src
|
||||
# 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)
|
||||
@ -209,8 +212,6 @@ libh5test_fortran_la_SOURCES = fortranlib_test.f90 tH5F.f90 tH5D.f90 \
|
||||
tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tf.f90 t.c
|
||||
|
||||
|
||||
libh5test_fortran_la_LDFLAGS = -static
|
||||
|
||||
# Source files are used for both the library and fortranlib_test.
|
||||
# Automake will complain about this without the following workaround.
|
||||
fortranlib_test_FFLAGS = $(AM_FFLAGS)
|
||||
|
@ -17,6 +17,9 @@ AM_FFLAGS=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
|
||||
# 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
|
||||
|
@ -190,6 +190,9 @@ AM_FFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/s
|
||||
# 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
|
||||
|
||||
@ -217,7 +220,6 @@ 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
|
||||
|
Loading…
Reference in New Issue
Block a user