Update Info.plists to hit new minimum requirement.

OrchidTechnologies · Jul 9, 2024 · c770b4f · c770b4f
1 parent 2ac292c
commit c770b4f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 27 deletions.
diff --git a/app-ios/info-app.plist.in b/app-ios/info-app.plist.in
@@ -22,28 +22,29 @@
     <string>@REVISION@</string>
 
     <key>BuildMachineOSBuild</key>
-    <string>18E226</string>
+    <string>23D56</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>en</string>
 
-    <key>DTCompiler</key>
-    <string>com.apple.compilers.llvm.clang.1_0</string>
     <key>DTPlatformName</key>
     <string>iphoneos</string>
+
+    <key>DTCompiler</key>
+    <string>com.apple.compilers.llvm.clang.1_0</string>
     <key>DTPlatformVersion</key>
-    <string>15.2</string>
+    <string>17.0</string>
     <key>DTPlatformBuild</key>
-    <string>19C51</string>
+    <string>21A326</string>
     <key>DTSDKBuild</key>
-    <string>19C51</string>
+    <string>21A326</string>
     <key>DTSDKName</key>
-    <string>iphoneos15.2</string>
+    <string>iphoneos17.0</string>
     <key>DTXcode</key>
-    <string>1320</string>
+    <string>1501</string>
     <key>DTXcodeBuild</key>
-    <string>13C100</string>
+    <string>15A507</string>
     <key>DTAppStoreToolsBuild</key>
-    <string>13E500</string>
+    <string>15E204</string>
 
     <key>LSApplicationCategoryType</key>
     <string>public.app-category.utilities</string>
@@ -59,7 +60,7 @@
     <integer>11</integer>
 
     <key>MinimumOSVersion</key>
-    <string>11.0</string>
+    <string>12.0</string>
 
     <key>CFBundleSupportedPlatforms</key>
     <array>

diff --git a/app-ios/info-vpn.plist.in b/app-ios/info-vpn.plist.in
@@ -24,28 +24,29 @@
     <string>@REVISION@</string>
 
     <key>BuildMachineOSBuild</key>
-    <string>18E226</string>
+    <string>23D56</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>en</string>
 
-    <key>DTCompiler</key>
-    <string>com.apple.compilers.llvm.clang.1_0</string>
     <key>DTPlatformName</key>
     <string>iphoneos</string>
+
+    <key>DTCompiler</key>
+    <string>com.apple.compilers.llvm.clang.1_0</string>
     <key>DTPlatformVersion</key>
-    <string>15.2</string>
+    <string>17.0</string>
     <key>DTPlatformBuild</key>
-    <string>19C51</string>
+    <string>21A326</string>
     <key>DTSDKBuild</key>
-    <string>19C51</string>
+    <string>21A326</string>
     <key>DTSDKName</key>
-    <string>iphoneos15.2</string>
+    <string>iphoneos17.0</string>
     <key>DTXcode</key>
-    <string>1320</string>
+    <string>1501</string>
     <key>DTXcodeBuild</key>
-    <string>13C100</string>
+    <string>15A507</string>
     <key>DTAppStoreToolsBuild</key>
-    <string>13E500</string>
+    <string>15E204</string>
 
     <key>LSApplicationCategoryType</key>
     <string>public.app-category.utilities</string>
@@ -67,7 +68,7 @@
     <integer>11</integer>
 
     <key>MinimumOSVersion</key>
-    <string>11.0</string>
+    <string>12.0</string>
 
     <key>CFBundleSupportedPlatforms</key>
     <array>

diff --git a/env/output.mk b/env/output.mk
@@ -136,7 +136,7 @@ $(output)/%/build.ninja: $$(specific) $$(folder)/meson.build $(output)/$$(arch)/
 	$(specific)
 	@rm -rf $(dir $@)
 	@mkdir -p $(dir $@)
-	cd $(dir $<) && ENV_ARCH="$(arch)" $(unshare) meson --cross-file $(CURDIR)/$(output)/$(arch)/meson.txt $(CURDIR)/$(dir $@) \
+	cd $(dir $<) && ENV_ARCH="$(arch)" $(unshare) meson setup --cross-file $(CURDIR)/$(output)/$(arch)/meson.txt $(CURDIR)/$(dir $@) \
 	    -Ddefault_library=static $(w_$(subst -,_,$(notdir $(patsubst %/meson.build,%,$<))))
 	cd $(dir $@); $(m_$(subst -,_,$(notdir $(patsubst %/meson.build,%,$<))))
 

diff --git a/env/target-apl.mk b/env/target-apl.mk
@@ -18,7 +18,6 @@ meson := darwin
 
 lflags += -Wl,-ObjC
 lflags += -Wl,-dead_strip
-lflags += -Wl,-no_dead_strip_inits_and_terms
 
 # libtool
 qflags += -DPIC
@@ -59,12 +58,11 @@ more += -fno-strict-return
 include $(pwd)/kit-android.mk
 cxx += -stdlib=libc++
 
-# the r22 NDK prefers its own copy of ld
-wflags += -fuse-ld=/usr/bin/ld
+include $(pwd)/target-lld.mk
 
 endif
 
-objc := clang $(more)
+objc := $(cc)
 
 define _
 strip/$(1) := strip

diff --git a/env/target-lld.mk b/env/target-lld.mk
@@ -9,7 +9,12 @@
 # }}}
 
 
+# XXX: ring needs to update to a newer version of cc-rs
+# https://github.com/briansmith/ring/issues/2126
+# XXX: this also runs into some issue with --gc-sections
+ifneq ($(meson),darwin)
 include $(pwd)/target-gnu.mk
+endif
 
 wflags += -fuse-ld=lld
 lflags += -Wl,--error-limit=0