summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Freeman <saurik@saurik.com>2008-06-16 20:05:50 +0000
committerJay Freeman <saurik@saurik.com>2008-06-16 20:05:50 +0000
commita0f5f155734556a2b802516aacdee164691e952a (patch)
tree789f9128f030fe2c698fadcc6826bba486d294b2
parentca53858247275e26e1d7b0f6559bd083dddbb4ba (diff)
Added support for more Mach-O file types to the ARM stripping.
git-svn-id: http://svn.telesphoreo.org/trunk@320 514c082c-b64e-11dc-b46d-3d985efe055d
-rw-r--r--arch/darwin-arm/strip4
-rw-r--r--arch/iphoneos-arm/strip6
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/darwin-arm/strip b/arch/darwin-arm/strip
index cc7b2ef85..cc6e4d69d 100644
--- a/arch/darwin-arm/strip
+++ b/arch/darwin-arm/strip
@@ -1,7 +1,7 @@
find "${PKG_DEST}" -type f \( -perm -0500 -o -name '*.dylib' \) -print0 | while read -r -d $'\0' bin; do
case "$(file "${bin}")" in (\
- *': setuid Mach-O executable acorn' |\
- *': Mach-O executable acorn' |\
+ *': Mach-O fat file with '*([0-9])' architecture' |\
+ *': '?(setuid )?(setgid )'Mach-O executable acorn' |\
*': Mach-O dynamically linked shared library acorn'\
);; (*) continue;; esac
diff --git a/arch/iphoneos-arm/strip b/arch/iphoneos-arm/strip
index 79482a7d9..c3949ae3c 100644
--- a/arch/iphoneos-arm/strip
+++ b/arch/iphoneos-arm/strip
@@ -1,10 +1,12 @@
find "${PKG_DEST}" -type f \( -perm -0500 -o -name '*.dylib' \) -print0 | while read -r -d $'\0' bin; do
case "$(file "${bin}")" in (\
- *': setuid Mach-O executable acorn' |\
- *': Mach-O executable acorn' |\
+ *': Mach-O fat file with '*([0-9])' architecture' |\
+ *': '?(setuid )?(setgid )'Mach-O executable acorn' |\
*': Mach-O dynamically linked shared library acorn'\
);; (*) continue;; esac
+ if arm-apple-darwin9-otool -hv "${bin}" | grep DYLIB_STUB &>/dev/null; then
+ continue; fi
CODESIGN_ALLOCATE=$(which arm-apple-darwin9-codesign_allocate) \
"${PKG_BASE}/util/ldid" -S "${bin}"
done