Build environment changes

25 files changed, 177 insertions, 66 deletions

diff --git a/arch/darwin-arm/environ.sh b/arch/darwin-arm/environ.sh
deleted file mode 100644
index 329ead2e6..000000000
--- a/arch/darwin-arm/environ.sh
+++ /dev/null
@@ -1 +0,0 @@
-export MACOSX_DEPLOYMENT_TARGET=10.4
diff --git a/arch/darwin-arm/firmware b/arch/darwin-arm/firmware
deleted file mode 100644
index 2915ef33b..000000000
--- a/arch/darwin-arm/firmware
+++ /dev/null
@@ -1,12 +0,0 @@
-iPhone1,1-1.0-1A543a
-iPhone1,1-1.0.1-1C25
-iPhone1,1-1.0.2-1C28
-iPhone1,1-1.1.1-3A109a
-iPhone1,1-1.1.2-3B48b
-iPhone1,1-1.1.3-4A93
-iPhone1,1-1.1.4-4A102
-iPod1,1-1.1-3A101a
-iPod1,1-1.1.1-3A110a
-iPod1,1-1.1.2-3B48b
-iPod1,1-1.1.3-4A93
-iPod1,1-1.1.4-4A102
diff --git a/arch/darwin-arm/strip b/arch/darwin-arm/strip
deleted file mode 100644
index 151f63b9d..000000000
--- a/arch/darwin-arm/strip
+++ /dev/null
@@ -1,9 +0,0 @@
-find "${PKG_DEST}" -type f \( -perm -0500 -o -name '*.dylib' -o -name '*.so' \) -print0 | while read -r -d $'\0' bin; do
-    case "$(file "${bin}")" in (\
-        *': Mach-O fat file with '*([0-9])' architecture' |\
-        *': Mach-O dynamically linked shared library acorn'\
-    );; (*) continue;; esac
-        #*': '?(setuid )?(setgid )'Mach-O executable acorn' |\
-
-    "${PKG_TARG}-strip" -x -no_uuid "${bin}"
-done
diff --git a/arch/darwin-arm/target b/arch/darwin-arm/target
deleted file mode 100644
index 34f6e4f76..000000000
--- a/arch/darwin-arm/target
+++ /dev/null
@@ -1 +0,0 @@
-arm-apple-darwin8
diff --git a/arch/iphoneos-arm/1443.00/entitlement.xml b/arch/iphoneos-arm/1443.00/entitlement.xml
new file mode 100644
index 000000000..efcd38e15
--- /dev/null
+++ b/arch/iphoneos-arm/1443.00/entitlement.xml
@@ -0,0 +1,9 @@
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>platform-application</key>
+	<true/>
+	<key>com.apple.private.skip-library-validation</key>
+	<true/>
+</dict>
+</plist>
diff --git a/arch/iphoneos-arm/1443.00/environ.sh b/arch/iphoneos-arm/1443.00/environ.sh
new file mode 100644
index 000000000..50cc6928f
--- /dev/null
+++ b/arch/iphoneos-arm/1443.00/environ.sh
@@ -0,0 +1,13 @@
+export PKG_ar="xcrun -sdk iphoneos ar"
+export PKG_dsymutil="xcrun -sdk iphoneos dsymutil"
+export PKG_gcc="xcrun -sdk iphoneos gcc"
+export PKG_nmedit="xcrun -sdk iphoneos nmedit"
+export PKG_otool="xcrun -sdk iphoneos otool"
+export PKG_strip="xcrun -sdk iphoneos strip"
+export PKG_codesign_allocate="xcrun -sdk iphoneos codesign_allocate"
+export PKG_gpp="xcrun -sdk iphoneos g++"
+export PKG_nm="xcrun -sdk iphoneos nm"
+export PKG_objdump="xcrun -sdk iphoneos objdump"
+export PKG_ranlib="xcrun -sdk iphoneos ranlib"
+export PKG_MCPU=""
+export MACOSX_DEPLOYMENT_TARGET=10.13
diff --git a/arch/iphoneos-arm/firmware b/arch/iphoneos-arm/1443.00/firmware
index 3618678d4..3618678d4 100644
--- a/arch/iphoneos-arm/firmware
+++ b/arch/iphoneos-arm/1443.00/firmware
diff --git a/arch/darwin-arm/prefix b/arch/iphoneos-arm/1443.00/prefix
index 74e4e23b0..74e4e23b0 100644
--- a/arch/darwin-arm/prefix
+++ b/arch/iphoneos-arm/1443.00/prefix
diff --git a/arch/iphoneos-arm/1443.00/strip b/arch/iphoneos-arm/1443.00/strip
new file mode 100644
index 000000000..fb6f928c1
--- /dev/null
+++ b/arch/iphoneos-arm/1443.00/strip
@@ -0,0 +1,33 @@
+export PATH=${PKG_BASE}/util:$PATH
+find "${PKG_DEST}" -type f \( -perm -0100 -o -name '*.dylib' -o -name '*.so' \) -print0 | while read -r -d $'\0' bin; do
+    ENTITLEMENT=""
+    case "$(file "${bin}")" in (\
+        *': Mach-O fat file with '*([0-9])' architecture' |\
+        *': '*(setuid |setgid )'Mach-O 64-bit executable arm64' \
+    )
+		    ENTITLEMENT="${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/entitlement.xml"
+		    ;;
+    (\
+				*': Mach-O '?(64-bit )'dynamically linked shared library '@(acorn|arm64) |\
+				*': Mach-O '?(64-bit )'bundle '@(acorn|arm64) |\
+        *': '*(setuid |setgid )'Mach-O executable acorn' \
+		)
+		    ;; 
+    (*) continue
+				;;
+		esac
+
+    if "${PKG_TARG}-otool" -hv "${bin}" | grep DYLIB_STUB &>/dev/null; then
+        continue; fi
+    if grep $'\xfa\xde\x0c\x01' "${bin}" &>/dev/null; then
+        continue; fi
+		if "${PKG_BASE}/util/ldid3" -e "${bin}" >/dev/null 2>&1; then
+			continue; fi
+
+    perms=$(stat -f %p "${bin}" | sed -e s/^1//)
+    chmod 755 "${bin}"
+		
+		echo "${PKG_BASE}/util/ldid3" -S"${ENTITLEMENT}" "${bin}"
+    "${PKG_BASE}/util/ldid3" -S"${ENTITLEMENT}" "${bin}"
+    chmod "${perms}" "${bin}"
+done
diff --git a/arch/iphoneos-arm/1443.00/target b/arch/iphoneos-arm/1443.00/target
new file mode 100644
index 000000000..d05ed09dc
--- /dev/null
+++ b/arch/iphoneos-arm/1443.00/target
@@ -0,0 +1 @@
+aarch64-apple-darwin17
diff --git a/arch/iphoneos-arm/1443.00/tools.txt b/arch/iphoneos-arm/1443.00/tools.txt
new file mode 100644
index 000000000..5e90e3f2e
--- /dev/null
+++ b/arch/iphoneos-arm/1443.00/tools.txt
@@ -0,0 +1,41 @@
+strip
+dsymutil
+nmedit
+g++
+c++
+gpp
+aCC
+CC
+cxx
+cc++
+cl.exe
+FCC
+KCC
+RCC
+xlC_r
+xlC
+g77
+xlf
+f77
+frt
+pgf77
+cf77
+fort77
+fl32
+af77
+xlf90
+f90
+pgf90
+pghpf
+epcf90
+gfortran
+g95
+xlf95
+f95
+fort
+ifort
+ifc
+efc
+pgf95
+lf95
+ftn
diff --git a/arch/iphoneos-arm/environ.sh b/arch/iphoneos-arm/478.23/environ.sh
index f115e0123..469bb6485 100644
--- a/arch/iphoneos-arm/environ.sh
+++ b/arch/iphoneos-arm/478.23/environ.sh
@@ -1 +1,2 @@
+export PKG_MCPU=-mthumb
 export MACOSX_DEPLOYMENT_TARGET=10.5
diff --git a/arch/iphoneos-arm64/firmware b/arch/iphoneos-arm/478.23/firmware
index 3618678d4..3618678d4 100644
--- a/arch/iphoneos-arm64/firmware
+++ b/arch/iphoneos-arm/478.23/firmware
diff --git a/arch/iphoneos-arm/prefix b/arch/iphoneos-arm/478.23/prefix
index 74e4e23b0..74e4e23b0 100644
--- a/arch/iphoneos-arm/prefix
+++ b/arch/iphoneos-arm/478.23/prefix
diff --git a/arch/iphoneos-arm/478.23/strip b/arch/iphoneos-arm/478.23/strip
new file mode 100644
index 000000000..f6c2125de
--- /dev/null
+++ b/arch/iphoneos-arm/478.23/strip
@@ -0,0 +1,26 @@
+find "${PKG_DEST}" -type f \( -perm -0100 -o -name '*.dylib' -o -name '*.so' \) -print0 | while read -r -d $'\0' bin; do
+    ENTITLEMENT=""
+    case "$(file "${bin}")" in (\
+        *': Mach-O fat file with '*([0-9])' architecture' |\
+        *': '*(setuid |setgid )'Mach-O executable acorn' |\
+        *': Mach-O '?(64-bit )'executable '@(arm64|arm_v6|acorn) |\
+        *': Mach-O bundle acorn'\
+    )
+		    ;;
+        (*': Mach-O '?(64-bit )'dynamically linked shared library '@(acorn|arm_v6|arm64))
+		    ;; 
+        (*) continue
+				;;
+		esac
+
+#    if arm-apple-darwin9-otool -hv "${bin}" | grep DYLIB_STUB &>/dev/null; then
+#        continue; fi
+#    if grep $'\xfa\xde\x0c\x01' "${bin}" &>/dev/null; then
+#        continue; fi
+
+    perms=$(stat -f %p "${bin}" | sed -e s/^1//)
+    chmod 755 "${bin}"
+    echo "${PKG_BASE}/util/ldid" -S "${bin}"
+    "${PKG_BASE}/util/ldid" -S "${bin}"
+    chmod "${perms}" "${bin}"
+done
diff --git a/arch/iphoneos-arm/target b/arch/iphoneos-arm/478.23/target
index 573e31146..573e31146 100644
--- a/arch/iphoneos-arm/target
+++ b/arch/iphoneos-arm/478.23/target
diff --git a/arch/iphoneos-arm/550.58/environ.sh b/arch/iphoneos-arm/550.58/environ.sh
new file mode 100644
index 000000000..9aa15966a
--- /dev/null
+++ b/arch/iphoneos-arm/550.58/environ.sh
@@ -0,0 +1,2 @@
+export PKG_MCPU="-mthumb -Wl,-segalign,4000"
+export MACOSX_DEPLOYMENT_TARGET=10.5
diff --git a/arch/iphoneos-arm/550.58/firmware b/arch/iphoneos-arm/550.58/firmware
new file mode 100644
index 000000000..3618678d4
--- /dev/null
+++ b/arch/iphoneos-arm/550.58/firmware
@@ -0,0 +1,24 @@
+iPhone1,1_2.0_5A347
+iPhone1,2_2.0_5A347
+iPod1,1_2.0_5A347
+iPhone1,1_2.0.1_5B108
+iPhone1,2_2.0.1_5B108
+iPod1,1_2.0.1_5B108
+iPhone1,1_2.0.2_5C1
+iPhone1,2_2.0.2_5C1
+iPod1,1_2.0.2_5C1
+iPhone1,1_2.1_5F136
+iPhone1,2_2.1_5F136
+iPod1,1_2.1_5F137
+iPhone1,1_2.2_5G77
+iPhone1,2_2.2_5G77
+iPod1,1_2.2_5G77
+iPhone1,1_2.2.1_5H11
+iPhone1,2_2.2.1_5H11
+iPod1,1_2.2.1_5H11
+iPod2,1_2.2.1_5H11a
+iPhone1,1_3.0_7A341
+iPhone1,2_3.0_7A341
+iPhone2,1_3.0_7A341
+iPod1,1_3.0_7A341
+iPod1,2_3.0_7A341
diff --git a/arch/iphoneos-arm64/prefix b/arch/iphoneos-arm/550.58/prefix
index 74e4e23b0..74e4e23b0 100644
--- a/arch/iphoneos-arm64/prefix
+++ b/arch/iphoneos-arm/550.58/prefix
diff --git a/arch/iphoneos-arm/550.58/strip b/arch/iphoneos-arm/550.58/strip
new file mode 100644
index 000000000..11c38c6d9
--- /dev/null
+++ b/arch/iphoneos-arm/550.58/strip
@@ -0,0 +1,26 @@
+find "${PKG_DEST}" -type f \( -perm -0100 -o -name '*.dylib' -o -name '*.so' \) -print0 | while read -r -d $'\0' bin; do
+    ENTITLEMENT=""
+    case "$(file "${bin}")" in (\
+        *': Mach-O fat file with '*([0-9])' architecture' |\
+        *': '*(setuid |setgid )'Mach-O executable acorn' |\
+        *': Mach-O '?(64-bit )'executable '@(arm64|arm_v[67]|acorn) |\
+        *': Mach-O bundle acorn'\
+    )
+		    ;;
+        (*': Mach-O '?(64-bit )'dynamically linked shared library '@(acorn|arm_v[67]|arm64))
+		    ;; 
+        (*) continue
+				;;
+		esac
+
+    if ${PKG_BASE}/util/arm-apple-darwin11-otool -hv "${bin}" | grep DYLIB_STUB &>/dev/null; then
+        continue; fi
+    if grep $'\xfa\xde\x0c\x01' "${bin}" &>/dev/null; then
+        continue; fi
+
+    perms=$(stat -f %p "${bin}" | sed -e s/^1//)
+    chmod 755 "${bin}"
+    echo "${PKG_BASE}/util/ldid" -S "${bin}"
+    "${PKG_BASE}/util/ldid" -S "${bin}"
+    chmod "${perms}" "${bin}"
+done
diff --git a/arch/iphoneos-arm/550.58/target b/arch/iphoneos-arm/550.58/target
new file mode 100644
index 000000000..df7b23146
--- /dev/null
+++ b/arch/iphoneos-arm/550.58/target
@@ -0,0 +1 @@
+arm-apple-darwin11
diff --git a/arch/iphoneos-arm/strip b/arch/iphoneos-arm/strip
deleted file mode 100644
index 5eb943311..000000000
--- a/arch/iphoneos-arm/strip
+++ /dev/null
@@ -1,19 +0,0 @@
-find "${PKG_DEST}" -type f \( -perm -0100 -o -name '*.dylib' -o -name '*.so' \) -print0 | while read -r -d $'\0' bin; do
-    case "$(file "${bin}")" in (\
-        *': Mach-O fat file with '*([0-9])' architecture' |\
-        *': '?(setuid )?(setgid )'Mach-O executable acorn' |\
-        *': Mach-O dynamically linked shared library acorn' |\
-        *': Mach-O bundle acorn'\
-    );; (*) continue;; esac
-
-    if arm-apple-darwin9-otool -hv "${bin}" | grep DYLIB_STUB &>/dev/null; then
-        continue; fi
-    if grep $'\xfa\xde\x0c\x01' "${bin}" &>/dev/null; then
-        continue; fi
-
-    perms=$(stat --format=%a "${bin}")
-    chmod 755 "${bin}"
-    "${PKG_BASE}/util/ldid" -S "${bin}"
-        #"${PKG_BASE}/arch/iphoneos-arm/entitlement.xml" "${bin}"
-    chmod "${perms}" "${bin}"
-done
diff --git a/arch/iphoneos-arm64/environ.sh b/arch/iphoneos-arm64/environ.sh
deleted file mode 100644
index 36d412804..000000000
--- a/arch/iphoneos-arm64/environ.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-arm64-apple-darwin9-gcc() {
-	xcrun -sdk iphoneos gcc $@
-}
-export -f arm64-apple-darwin9-gcc
-export MACOSX_DEPLOYMENT_TARGET=10.5
diff --git a/arch/iphoneos-arm64/strip b/arch/iphoneos-arm64/strip
deleted file mode 100644
index c4801ca85..000000000
--- a/arch/iphoneos-arm64/strip
+++ /dev/null
@@ -1,18 +0,0 @@
-find "${PKG_DEST}" -type f \( -perm -0100 -o -name '*.dylib' -o -name '*.so' \) -print0 | while read -r -d $'\0' bin; do
-    case "$(file "${bin}")" in (\
-        *': Mach-O fat file with '*([0-9])' architecture' |\
-        *': '?(setuid )?(setgid )'Mach-O executable acorn' |\
-        *': Mach-O dynamically linked shared library acorn' |\
-        *': Mach-O bundle acorn'\
-    );; (*) continue;; esac
-
-    if arm64-apple-darwin9-otool -hv "${bin}" | grep DYLIB_STUB &>/dev/null; then
-        continue; fi
-    if grep $'\xfa\xde\x0c\x01' "${bin}" &>/dev/null; then
-        continue; fi
-
-    perms=$(stat --format=%a "${bin}")
-    chmod 755 "${bin}"
-    "${PKG_BASE}/util/ldid" -S"${PKG_BASE}/arch/iphoneos-arm/entitlement.xml" "${bin}"
-    chmod "${perms}" "${bin}"
-done
diff --git a/arch/iphoneos-arm64/target b/arch/iphoneos-arm64/target
deleted file mode 100644
index 3631f7228..000000000
--- a/arch/iphoneos-arm64/target
+++ /dev/null
@@ -1 +0,0 @@
-arm64-apple-darwin9