From 80038dc4a4b00e850b3a0bf517ed89929c4868f3 Mon Sep 17 00:00:00 2001
From: Joe Garcia <joe.garcia@ssec.wisc.edu>
Date: Fri, 18 Sep 2015 10:53:11 -0500
Subject: [PATCH] move script-relocation to avoid fail in binary scan, omitted
from package
---
ShellB3/shallbethree.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh
index 0f8cde3b..b9caea26 100755
--- a/ShellB3/shallbethree.sh
+++ b/ShellB3/shallbethree.sh
@@ -1250,9 +1250,12 @@ install_macgfortran() {
;;
esac
- #clean out libraries we dont need
+ ##clean out libraries we dont need
mkdir libsys
- mv lib/lib{mpc,mpfr,gmp,cc1}* lib/gcc libsys
+ mv lib/lib{mpc,mpfr,gmp,cc1}* libsys
+ rm lib/gcc/*/*/plugin/libcc1plugin*
+ #mv lib/gcc libsys
+ #(cd libsys && ln -s ../lib/libgfortran.spec .)
for f in `find * -type f | egrep -v "^(src|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
@@ -5197,7 +5200,6 @@ scan_bins() {
fi
fi
done
- test $script_check -eq 0 || oops "Non-relocated python scripts exist"
echo done script scans
if isDarwin ; then
@@ -5207,6 +5209,7 @@ scan_bins() {
else
oops "Unknown binary system for " ${SYSNAME}
fi
+ test $script_check -eq 0 || oops "Non-relocated python scripts exist"
}
# remove .py files where .pyc equivalents exist, to save space
--
GitLab