Commit 93b2b0a4 authored by Adam Mercer's avatar Adam Mercer
Browse files

hack around broken multilib support on SL6

libtool on SL6 passes the /usr/lib64 system library path to the compiler
ahead of any local paths, therefore system libraries are linked in
preference. this patch overrides the system library path detected by
libtool to ensure that system paths aren't passed, hence leading to
correct linkage
Original: d91568076fe6f0d90d74611c33b5cd2438c73972
parent 1609f478
# lalsuite_build.m4 - top level build macros
#
# serial 28
# serial 29
AC_DEFUN([LALSUITE_USE_LIBTOOL],
[## $0: Generate a libtool script for use in configure tests
......@@ -22,6 +22,19 @@ AC_DEFUN([LALSUITE_ARG_VAR],[
AC_ARG_VAR(LALSUITE_TOP_SRCDIR,[Set to top source directory of lalsuite])
])
AC_DEFUN([LALSUITE_MULTILIB_LIBTOOL_HACK],
[## $0: libtool incorrectly determine library path on SL6
case "${host}" in
x86_64-*-linux-gnu*)
redhat_release=`cat /etc/redhat-release 2> /dev/null`
if test "${redhat_release}" = "Scientific Linux release 6.1 (Carbon)"; then
AC_MSG_NOTICE([hacking round broken libtool multilib support on SL6])
lt_cv_sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"
fi
;;
esac
]) # LALSUITE_MULTILIB_LIBTOOL_HACK
# store configure flags for 'make distcheck'
AC_DEFUN([LALSUITE_DISTCHECK_CONFIGURE_FLAGS],[
DISTCHECK_CONFIGURE_FLAGS=
......
......@@ -189,6 +189,9 @@ if test "$lal_pthread_lock" = "true" ; then
fi
fi
# workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK
# check for c compiler
m4_pattern_allow([AC_PROG_CC_C99])
m4_ifdef([AC_PROG_CC_C99],[AC_PROG_CC_C99],[LALSUITE_AC_PROG_CC_C99])
......
......@@ -126,6 +126,9 @@ else
allstatic="true"
fi
# workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK
# check for c compiler
m4_pattern_allow([AC_PROG_CC_C99])
m4_ifdef([AC_PROG_CC_C99],[AC_PROG_CC_C99],[LALSUITE_AC_PROG_CC_C99])
......
......@@ -74,6 +74,9 @@ AC_DEFINE_UNQUOTED([LALBURST_CONFIGURE_DATE],["$lalburst_configure_date"],
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK
# check for c compiler
m4_pattern_allow([AC_PROG_CC_C99])
m4_ifdef([AC_PROG_CC_C99],[AC_PROG_CC_C99],[LALSUITE_AC_PROG_CC_C99])
......
......@@ -77,6 +77,9 @@ AC_DEFINE_UNQUOTED([LALFRAME_CONFIGURE_DATE],["$lalframe_configure_date"],
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK
# check for c compiler
m4_pattern_allow([AC_PROG_CC_C99])
m4_ifdef([AC_PROG_CC_C99],[AC_PROG_CC_C99],[LALSUITE_AC_PROG_CC_C99])
......
......@@ -81,6 +81,9 @@ LALSUITE_ENABLE_LALINSPIRAL
LALSUITE_ENABLE_LALPULSAR
LALSUITE_ENABLE_LALXML
# workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK
# check for c compiler
m4_pattern_allow([AC_PROG_CC_C99])
m4_ifdef([AC_PROG_CC_C99],[AC_PROG_CC_C99],[LALSUITE_AC_PROG_CC_C99])
......
......@@ -77,6 +77,9 @@ LALSUITE_ENABLE_GCC_FLAGS
# optional lal libraries
LALSUITE_ENABLE_LALFRAME
# workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK
# check for c compiler
m4_pattern_allow([AC_PROG_CC_C99])
m4_ifdef([AC_PROG_CC_C99],[AC_PROG_CC_C99],[LALSUITE_AC_PROG_CC_C99])
......
......@@ -73,6 +73,9 @@ AC_DEFINE_UNQUOTED([LALMETAIO_CONFIGURE_DATE],["$lalmetaio_configure_date"],
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK
# check for c compiler
m4_pattern_allow([AC_PROG_CC_C99])
m4_ifdef([AC_PROG_CC_C99],[AC_PROG_CC_C99],[LALSUITE_AC_PROG_CC_C99])
......
......@@ -83,6 +83,9 @@ LALSUITE_ENABLE_BOINC
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK
# check for c compiler
m4_pattern_allow([AC_PROG_CC_C99])
m4_ifdef([AC_PROG_CC_C99],[AC_PROG_CC_C99],[LALSUITE_AC_PROG_CC_C99])
......
......@@ -77,6 +77,9 @@ AC_DEFINE_UNQUOTED([LALSIMULATION_CONFIGURE_DATE],["$lalsimulation_configure_dat
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK
# check for c compiler
m4_pattern_allow([AC_PROG_CC_C99])
m4_ifdef([AC_PROG_CC_C99],[AC_PROG_CC_C99],[LALSUITE_AC_PROG_CC_C99])
......
......@@ -74,6 +74,9 @@ AC_DEFINE_UNQUOTED([LALSTOCHASTIC_CONFIGURE_DATE],["$lalstochastic_configure_dat
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK
# check for c compiler
m4_pattern_allow([AC_PROG_CC_C99])
m4_ifdef([AC_PROG_CC_C99],[AC_PROG_CC_C99],[LALSUITE_AC_PROG_CC_C99])
......
......@@ -77,6 +77,9 @@ AC_DEFINE_UNQUOTED([LALXML_CONFIGURE_DATE],["$lalxml_configure_date"],
# enable strict gcc flags
LALSUITE_ENABLE_GCC_FLAGS
# workaround broken libtool multilib support on sl6
LALSUITE_MULTILIB_LIBTOOL_HACK
# check for c compiler
m4_pattern_allow([AC_PROG_CC_C99])
m4_ifdef([AC_PROG_CC_C99],[AC_PROG_CC_C99],[LALSUITE_AC_PROG_CC_C99])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment