Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Disable switch to the iphoneos sdk for arm targets * Disable unsupported "runtime-cpu-detect" feature on arm64 * Add arm64 to `supported_archs` Fixes: https://trac.macports.org/ticket/60940
- Loading branch information
Showing
2 changed files
with
35 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 25 additions & 6 deletions
31
multimedia/libvpx/files/patch-build-make-configure.sh.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,30 @@ | ||
--- build/make/configure.sh.orig 2020-08-01 00:27:21.000000000 +0200 | ||
+++ build/make/configure.sh 2020-08-01 00:29:56.000000000 +0200 | ||
@@ -854,7 +854,7 @@ | ||
fi | ||
;; | ||
x86*-darwin*) | ||
--- build/make/configure.sh.orig 2020-11-26 14:23:30.000000000 -0800 | ||
+++ build/make/configure.sh 2020-11-26 14:26:37.000000000 -0800 | ||
@@ -845,16 +845,8 @@ | ||
# Handle darwin variants. Newer SDKs allow targeting older | ||
# platforms, so use the newest one available. | ||
case ${toolchain} in | ||
- arm*-darwin*) | ||
- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}" | ||
- iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)" | ||
- if [ -d "${iphoneos_sdk_dir}" ]; then | ||
- add_cflags "-isysroot ${iphoneos_sdk_dir}" | ||
- add_ldflags "-isysroot ${iphoneos_sdk_dir}" | ||
- fi | ||
- ;; | ||
- x86*-darwin*) | ||
- osx_sdk_dir="$(show_darwin_sdk_path macosx)" | ||
+ *-darwin*) | ||
+ osx_sdk_dir="$(configure.sdkroot)" | ||
if [ -d "${osx_sdk_dir}" ]; then | ||
add_cflags "-isysroot ${osx_sdk_dir}" | ||
add_ldflags "-isysroot ${osx_sdk_dir}" | ||
@@ -1085,7 +1077,7 @@ | ||
;; | ||
|
||
darwin*) | ||
- if ! enabled external_build; then | ||
+ if false; then | ||
XCRUN_FIND="xcrun --sdk iphoneos --find" | ||
CXX="$(${XCRUN_FIND} clang++)" | ||
CC="$(${XCRUN_FIND} clang)" |