From d0e4728f668e938a1d328ee0d8694edd550ea80b Mon Sep 17 00:00:00 2001
From: Joe Garcia <joe.garcia@ssec.wisc.edu>
Date: Thu, 13 Feb 2014 12:38:32 -0600
Subject: [PATCH] merge differences from py3
---
ShellB3/shallbethree.sh | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh
index 86cf2084..4cb5ac0c 100755
--- a/ShellB3/shallbethree.sh
+++ b/ShellB3/shallbethree.sh
@@ -341,8 +341,8 @@ install_macgfortran() {
for f in `find * -type f | grep -v build/ | egrep -v "\.(o|a)\$" ` ; do #bin/* `find lib* -name "*.dylib"` `find lib* -name "*.so"` ; do
if [ -z "$(otool -L "$f" 2>/dev/null | grep "not an object" )" ] ; then
for li in lib/*.dylib ; do
- echo "-change /usr/local/${li} @rpath/${li}"
- done | xargs install_name_tool -id @rpath/$f -add_rpath @loader_path/.. \
+ echo "-change /usr/local/${li} ${BASE}/${li}"
+ done | xargs install_name_tool -id ${BASE}/$f -add_rpath @loader_path/.. \
$f
fi
done
@@ -1056,7 +1056,9 @@ mk_scipy() {
&& ../../bin/python setup.py install ) \
|| oops "scipy build failed"
[ "$(uname -s)" == "Darwin" ] && _tmpenvres LDFLAGS
- [ "$(uname -s)" == "Darwin" ] && install_name_tool -change /usr/local/lib/libgcc_s.1.dylib @rpath/lib/libgcc_s.1.dylib Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/scipy/optimize/_minpack.so
+ [ "$(uname -s)" == "Darwin" ] && for f in $( find Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/scipy -type f -name "*.so" ) ; do \
+ install_name_tool -change /usr/local/lib/libgcc_s.1.dylib ${BASE}/lib/libgcc_s.1.dylib "$f" ; \
+ done
return 0
}
@@ -1401,7 +1403,9 @@ mk_pycairo() {
&& PATH=$BASE/bin:$PATH ./waf build \
&& PATH=$BASE/bin:$PATH ./waf install ) \
|| oops "${name} build failed"
- [ "$(uname -s)" == "Darwin" ] && install_name_tool -id @rpath/lib/python2.7/site-packages/cairo/_cairo.so lib/python2.7/site-packages/cairo/_cairo.so
+ [ "$(uname -s)" == "Darwin" ] && for f in $( find ${BASE}/lib/python2.7/site-packages/cairo -type f -name "*.so" ) ; do \
+ install_name_tool -id "$f" "$f" ; \
+ done
return 0
}
@@ -1750,6 +1754,10 @@ mk_llvm() {
&& MAKEFLAGS="" make install ) \
|| oops "${name} build failed"
_tmpenvres CXX CC
+ [ "$(uname -s)" == "Darwin" ] && for f in "${BASE}/"lib/*.dylib ; do \
+ install_name_tool -id "$f" "$f" ; \
+ done
+ return 0
#_configure_make_install llvm src/optional/llvm-${LLVMVER}.src.tar.gz llvm-${LLVMVER}.src --enable-shared --enable-keep-symbols
}
@@ -1786,8 +1794,8 @@ mk_backports() {
mk_llvmpy() {
LLVM_CONFIG_PATH="${BASE}/bin/llvm-config" _setup_build_install llvmpy src/optional/llvmpy-${LLVMPYVER}.tar.gz llvmpy-${LLVMPYVER}
- [ "$(uname -s)" == "Darwin" ] && install_name_tool -change @executable_path/../lib/libLLVM-${LLVMVER}svn.dylib @rpath/lib/libLLVM-${LLVMVER}svn.dylib \
- -change @executable_path/../lib/libLLVM-${LLVMVER}.dylib @rpath/lib/libLLVM-${LLVMVER}.dylib \
+ [ "$(uname -s)" == "Darwin" ] && install_name_tool -change @executable_path/../lib/libLLVM-${LLVMVER}svn.dylib ${BASE}/lib/libLLVM-${LLVMVER}svn.dylib \
+ -change @executable_path/../lib/libLLVM-${LLVMVER}.dylib ${BASE}/lib/libLLVM-${LLVMVER}.dylib \
Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/llvmpy/_api.so
return 0
}
@@ -1952,10 +1960,10 @@ mk_boost() {
|| oops "${name} build failed"
[ "$(uname -s)" == "Darwin" ] && for f in lib/libboost*.dylib ; do \
install_name_tool $( for g in lib/libboost*.dylib ; do \
- echo "-change ./$g @rpath/$g" ; \
- echo "-change $(basename $g) @rpath/$g" ; \
+ echo "-change ./$g ${BASE}/$g" ; \
+ echo "-change $(basename $g) ${BASE}/$g" ; \
done ) \
- -id "@rpath/"$f $f ; done
+ -id "${BASE}"/$f $f ; done
return 0
}
--
GitLab