Changed the handling of shared library options, in order to allow for
correct compilation of lapack/dlamch.c.
This commit is contained in:
kolev
parent
0383529b6b
commit
afc047e3d7
@ -94,6 +94,9 @@ BUILD_F77_SHARED = @BUILD_F77_SHARED@
|
||||
BUILD_CC_SHARED = @BUILD_CC_SHARED@
|
||||
BUILD_CXX_SHARED = @BUILD_CXX_SHARED@
|
||||
|
||||
SHARED_COMPILE_FLAG = @SHARED_COMPILE_FLAG@
|
||||
SHARED_BUILD_FLAG = @SHARED_BUILD_FLAG@
|
||||
|
||||
BUILD_PYTHON = @BUILD_PYTHON@
|
||||
PYTHON = @PYTHON@
|
||||
|
||||
|
||||
@ -1105,24 +1105,22 @@ if test "$casc_using_shared" = "yes"
|
||||
then
|
||||
HYPRE_LIBSUFFIX=".so"
|
||||
case $hypre_platform in
|
||||
AIX* | aix* | Aix*) FFLAGS="${FFLAGS} -qmkshrobj"
|
||||
CFLAGS="${CFLAGS} -qmkshrobj"
|
||||
CXXFLAGS="${CXXFLAGS} -qmkshrobj"
|
||||
BUILD_F77_SHARED="${F77} -G"
|
||||
BUILD_CC_SHARED="${CC} -G"
|
||||
BUILD_CXX_SHARED="${CXX} -G"
|
||||
AIX* | aix* | Aix*) SHARED_COMPILE_FLAG="-qmkshrobj"
|
||||
SHARED_BUILD_FLAG="-G"
|
||||
LINK_F77="${F77} -brtl"
|
||||
LINK_CC="${CC} -brtl"
|
||||
LINK_CXX="${CXX} -brtl"
|
||||
;;
|
||||
*) FFLAGS="${FFLAGS} -fPIC"
|
||||
CFLAGS="${CFLAGS} -fPIC"
|
||||
CXXFLAGS="${CXXFLAGS} -fPIC"
|
||||
BUILD_F77_SHARED="${F77} -shared"
|
||||
BUILD_CC_SHARED="${CC} -shared"
|
||||
BUILD_CXX_SHARED="${CXX} -shared"
|
||||
*) SHARED_COMPILE_FLAG="-fPIC"
|
||||
SHARED_BUILD_FLAG="-shared"
|
||||
;;
|
||||
esac
|
||||
FFLAGS="${FFLAGS} ${SHARED_COMPILE_FLAG}"
|
||||
CFLAGS="${CFLAGS} ${SHARED_COMPILE_FLAG}"
|
||||
CXXFLAGS="${CXXFLAGS} ${SHARED_COMPILE_FLAG}"
|
||||
BUILD_F77_SHARED="${F77} ${SHARED_BUILD_FLAG}"
|
||||
BUILD_CC_SHARED="${CC} ${SHARED_BUILD_FLAG}"
|
||||
BUILD_CXX_SHARED="${CXX} ${SHARED_BUILD_FLAG}"
|
||||
fi
|
||||
|
||||
BUILD_PYTHON=0
|
||||
@ -1287,6 +1285,9 @@ AC_SUBST(BUILD_F77_SHARED)
|
||||
AC_SUBST(BUILD_CC_SHARED)
|
||||
AC_SUBST(BUILD_CXX_SHARED)
|
||||
|
||||
AC_SUBST(SHARED_COMPILE_FLAG)
|
||||
AC_SUBST(SHARED_BUILD_FLAG)
|
||||
|
||||
AC_SUBST(BUILD_PYTHON)
|
||||
AC_SUBST(PYTHON)
|
||||
|
||||
|
||||
29
configure
vendored
29
configure
vendored
@ -336,7 +336,7 @@ ac_includes_default="\
|
||||
#endif"
|
||||
|
||||
ac_subdirs_all="$ac_subdirs_all babel-runtime"
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS HYPRE_PACKAGE_DATETIME HYPRE_TOP_SRCDIR HYPRE_RELEASEVERSION HYPRE_RELEASEDATE HYPRE_RELEASETIME HYPRE_RELEASEDATETIME build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CXX F77 RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK LN_S SET_MAKE CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CXXFLAGS ac_ct_CXX CXXCPP FFLAGS ac_ct_F77 FLIBS FPP EGREP POW_LIB LIBOBJS MPILIBS subdirs BABELDIR EXAMPLEDIR HYPRE_ARCH HOSTNAME F77FLAGS LINK_F77 LINK_CC LINK_CXX BUILD_F77_SHARED BUILD_CC_SHARED BUILD_CXX_SHARED BUILD_PYTHON PYTHON HYPRE_INSTALLDIR HYPRE_LIBINSTALL HYPRE_INCINSTALL INCLUDES LIBDIRS LDLIBS LDLIBDIRS HYPRE_LINKDIR HYPRE_LIBSUFFIX MPIINCLUDE MPILIBDIRS MPIFLAGS TIMERDEFS FEILIBS FEILIBDIRS FEIINCLUDE HYPRE_FEI_SRC_DIR HYPRE_FEI_BASE_DIR HYPRE_FEI_SUBDIRS HYPRE_FEI_SUPERLU_FILES HYPRE_FEI_HYPRE_FILES HYPRE_FEI_FEMLI_FILES MLI_DIR MLILIBS MLILIBDIRS MLIINCLUDE HYPRE_BLAS_SRC_DIR BLASLIBDIRS BLASLIBS HYPRE_LAPACK_SRC_DIR LAPACKLIBDIRS LAPACKLIBS AR LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS HYPRE_PACKAGE_DATETIME HYPRE_TOP_SRCDIR HYPRE_RELEASEVERSION HYPRE_RELEASEDATE HYPRE_RELEASETIME HYPRE_RELEASEDATETIME build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CXX F77 RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK LN_S SET_MAKE CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CXXFLAGS ac_ct_CXX CXXCPP FFLAGS ac_ct_F77 FLIBS FPP EGREP POW_LIB LIBOBJS MPILIBS subdirs BABELDIR EXAMPLEDIR HYPRE_ARCH HOSTNAME F77FLAGS LINK_F77 LINK_CC LINK_CXX BUILD_F77_SHARED BUILD_CC_SHARED BUILD_CXX_SHARED SHARED_COMPILE_FLAG SHARED_BUILD_FLAG BUILD_PYTHON PYTHON HYPRE_INSTALLDIR HYPRE_LIBINSTALL HYPRE_INCINSTALL INCLUDES LIBDIRS LDLIBS LDLIBDIRS HYPRE_LINKDIR HYPRE_LIBSUFFIX MPIINCLUDE MPILIBDIRS MPIFLAGS TIMERDEFS FEILIBS FEILIBDIRS FEIINCLUDE HYPRE_FEI_SRC_DIR HYPRE_FEI_BASE_DIR HYPRE_FEI_SUBDIRS HYPRE_FEI_SUPERLU_FILES HYPRE_FEI_HYPRE_FILES HYPRE_FEI_FEMLI_FILES MLI_DIR MLILIBS MLILIBDIRS MLIINCLUDE HYPRE_BLAS_SRC_DIR BLASLIBDIRS BLASLIBS HYPRE_LAPACK_SRC_DIR LAPACKLIBDIRS LAPACKLIBS AR LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@ -9872,24 +9872,22 @@ if test "$casc_using_shared" = "yes"
|
||||
then
|
||||
HYPRE_LIBSUFFIX=".so"
|
||||
case $hypre_platform in
|
||||
AIX* | aix* | Aix*) FFLAGS="${FFLAGS} -qmkshrobj"
|
||||
CFLAGS="${CFLAGS} -qmkshrobj"
|
||||
CXXFLAGS="${CXXFLAGS} -qmkshrobj"
|
||||
BUILD_F77_SHARED="${F77} -G"
|
||||
BUILD_CC_SHARED="${CC} -G"
|
||||
BUILD_CXX_SHARED="${CXX} -G"
|
||||
AIX* | aix* | Aix*) SHARED_COMPILE_FLAG="-qmkshrobj"
|
||||
SHARED_BUILD_FLAG="-G"
|
||||
LINK_F77="${F77} -brtl"
|
||||
LINK_CC="${CC} -brtl"
|
||||
LINK_CXX="${CXX} -brtl"
|
||||
;;
|
||||
*) FFLAGS="${FFLAGS} -fPIC"
|
||||
CFLAGS="${CFLAGS} -fPIC"
|
||||
CXXFLAGS="${CXXFLAGS} -fPIC"
|
||||
BUILD_F77_SHARED="${F77} -shared"
|
||||
BUILD_CC_SHARED="${CC} -shared"
|
||||
BUILD_CXX_SHARED="${CXX} -shared"
|
||||
*) SHARED_COMPILE_FLAG="-fPIC"
|
||||
SHARED_BUILD_FLAG="-shared"
|
||||
;;
|
||||
esac
|
||||
FFLAGS="${FFLAGS} ${SHARED_COMPILE_FLAG}"
|
||||
CFLAGS="${CFLAGS} ${SHARED_COMPILE_FLAG}"
|
||||
CXXFLAGS="${CXXFLAGS} ${SHARED_COMPILE_FLAG}"
|
||||
BUILD_F77_SHARED="${F77} ${SHARED_BUILD_FLAG}"
|
||||
BUILD_CC_SHARED="${CC} ${SHARED_BUILD_FLAG}"
|
||||
BUILD_CXX_SHARED="${CXX} ${SHARED_BUILD_FLAG}"
|
||||
fi
|
||||
|
||||
BUILD_PYTHON=0
|
||||
@ -10302,6 +10300,9 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -10982,6 +10983,8 @@ s,@LINK_CXX@,$LINK_CXX,;t t
|
||||
s,@BUILD_F77_SHARED@,$BUILD_F77_SHARED,;t t
|
||||
s,@BUILD_CC_SHARED@,$BUILD_CC_SHARED,;t t
|
||||
s,@BUILD_CXX_SHARED@,$BUILD_CXX_SHARED,;t t
|
||||
s,@SHARED_COMPILE_FLAG@,$SHARED_COMPILE_FLAG,;t t
|
||||
s,@SHARED_BUILD_FLAG@,$SHARED_BUILD_FLAG,;t t
|
||||
s,@BUILD_PYTHON@,$BUILD_PYTHON,;t t
|
||||
s,@PYTHON@,$PYTHON,;t t
|
||||
s,@HYPRE_INSTALLDIR@,$HYPRE_INSTALLDIR,;t t
|
||||
|
||||
@ -125,6 +125,6 @@ distclean: clean
|
||||
#################################################################
|
||||
|
||||
dlamch.o : dlamch.c ${LAPACK_HEADERS}
|
||||
${CC} -c dlamch.c
|
||||
${CC} ${SHARED_COMPILE_FLAG} -c dlamch.c
|
||||
|
||||
${OBJS}: ${LAPACK_HEADERS}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user