From 67742be9f30f77317f98a5d777d17a153727095c Mon Sep 17 00:00:00 2001
From: Joe Garcia <joe.garcia@ssec.wisc.edu>
Date: Fri, 18 Sep 2015 22:46:57 -0500
Subject: [PATCH] fix for relocations
---
ShellB3/shallbethree.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh
index b9caea26..99654abb 100755
--- a/ShellB3/shallbethree.sh
+++ b/ShellB3/shallbethree.sh
@@ -1390,7 +1390,7 @@ if isDarwin ; then
export SB3FFLAGS="--sysroot=${SYSROOT} ${CPUFLAGS} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
export SB3CFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
export SB3CXXFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
- export SB3LDFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -L${SYSROOT}/usr/lib/gcc/${GFORTRANPLATFORM}/${GFORTRANVERSION}/ -L${BASE}/libsys/gcc/${GFORTRANPLATFORM}/${GFORTRANVERSION}/ -headerpad_max_install_names -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT"
+ export SB3LDFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -L${SYSROOT}/usr/lib/gcc/${GFORTRANPLATFORM}/${GFORTRANVERSION}/ -L${BASE}/lib/gcc/${GFORTRANPLATFORM}/${GFORTRANVERSION}/ -headerpad_max_install_names -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT"
export SB3CPPFLAGS=" -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT"
if [ ${NATIVEDARWINVERNUMBER} -gt ${DARWINVERNUMBER} ] ; then
export SB3LDFLAGS="${SB3LDFLAGS} -stdlib=libstdc++" #newer build systems will default to libc++. older systems don't even know this parameter
@@ -1406,7 +1406,7 @@ if isDarwin ; then
export SB3FFLAGS="--sysroot=${SYSROOT} ${CPUFLAGS} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
export SB3CFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
export SB3CXXFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
- export SB3LDFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -L${BASE}/libsys/gcc/${GFORTRANPLATFORM}/${GFORTRANVERSION}/ -lc++ -lc++abi -headerpad_max_install_names -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT"
+ export SB3LDFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -L${BASE}/lib/gcc/${GFORTRANPLATFORM}/${GFORTRANVERSION}/ -lc++ -lc++abi -headerpad_max_install_names -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT"
export SB3CPPFLAGS="-stdlib=libc++ -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT"
export FORBIDDENLIBS="libstdc++"
export USE_SYS_ZLIB=YES
@@ -1417,7 +1417,7 @@ if isDarwin ; then
export SB3FFLAGS="--sysroot=${SYSROOT} ${CPUFLAGS} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
export SB3CFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
export SB3CXXFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
- export SB3LDFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -L${BASE}/libsys/gcc/${GFORTRANPLATFORM}/${GFORTRANVERSION}/ -lc++ -lc++abi -headerpad_max_install_names -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT"
+ export SB3LDFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -L${BASE}/lib/gcc/${GFORTRANPLATFORM}/${GFORTRANVERSION}/ -lc++ -lc++abi -headerpad_max_install_names -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT"
export SB3CPPFLAGS="-stdlib=libc++ -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT"
export FORBIDDENLIBS="libstdc++"
;;
@@ -3075,9 +3075,9 @@ mk_cairo() {
_find_cots ZLIB include/zlib.h $BASE $COTS_HOME ${SYSROOT}/usr || oops "cairo needs ZLIB"
_find_cots PNG bin/libpng-config $BASE $COTS_HOME ${SYSROOT}/usr || oops 'cairo needs PNG'
_find_cots THINEPKGCONFIG pkg-config $BASE/sysbin /usr/bin /usr/local/bin /opt/bin || mk_pkgconfig #shouldn't use /sw's. will get fink dependency
- CAIROADDITIONALFLAGS=""
+ CAIROADDITIONALFLAGS="--enable-pthread=yes"
isDarwin && CAIROADDITIONALFLAGS="${CAIROADDITIONALFLAGS} --enable-xlib=no --enable-quartz-image"
- _configure_make_install cairo src/optional/cairo-${CAIROVER}.tar.* cairo-${CAIROVER} ${CAIROADDITIONALFLAGS}
+ _configure_make_install cairo src/optional/cairo-${CAIROVER}.tar.* cairo-${CAIROVER} ${CAIROADDITIONALFLAGS}
}
mk_pycairo() {
--
GitLab