| 5 | |
| 6 | Edit; |
| 7 | \\ |
| 8 | Remade the patch and just removed that section since macports built `libvpx` even with the incorrect usage of `configure.sdkroot` |
| 9 | {{{ |
| 10 | --- build/make/configure.sh.orig.sh 2019-07-15 14:55:32.000000000 -0400 |
| 11 | +++ build/make/configure.sh 2 019-10-16 22:59:42.000000000 -0400 |
| 12 | @@ -767,37 +767,9 @@ |
| 13 | |
| 14 | # detect tgt_os |
| 15 | case "$gcctarget" in |
| 16 | - *darwin10*) |
| 17 | + *darwin*) |
| 18 | tgt_isa=x86_64 |
| 19 | - tgt_os=darwin10 |
| 20 | - ;; |
| 21 | - *darwin11*) |
| 22 | - tgt_isa=x86_64 |
| 23 | - tgt_os=darwin11 |
| 24 | - ;; |
| 25 | - *darwin12*) |
| 26 | - tgt_isa=x86_64 |
| 27 | - tgt_os=darwin12 |
| 28 | - ;; |
| 29 | - *darwin13*) |
| 30 | - tgt_isa=x86_64 |
| 31 | - tgt_os=darwin13 |
| 32 | - ;; |
| 33 | - *darwin14*) |
| 34 | - tgt_isa=x86_64 |
| 35 | - tgt_os=darwin14 |
| 36 | - ;; |
| 37 | - *darwin15*) |
| 38 | - tgt_isa=x86_64 |
| 39 | - tgt_os=darwin15 |
| 40 | - ;; |
| 41 | - *darwin16*) |
| 42 | - tgt_isa=x86_64 |
| 43 | - tgt_os=darwin16 |
| 44 | - ;; |
| 45 | - *darwin17*) |
| 46 | - tgt_isa=x86_64 |
| 47 | - tgt_os=darwin17 |
| 48 | + tgt_os=darwin |
| 49 | ;; |
| 50 | x86_64*mingw32*) |
| 51 | tgt_os=win64 |
| 52 | @@ -881,65 +853,6 @@ |
| 53 | add_ldflags "-isysroot ${iphoneos_sdk_dir}" |
| 54 | fi |
| 55 | ;; |
| 56 | - x86*-darwin*) |
| 57 | - osx_sdk_dir="$(show_darwin_sdk_path macosx)" |
| 58 | - if [ -d "${osx_sdk_dir}" ]; then |
| 59 | - add_cflags "-isysroot ${osx_sdk_dir}" |
| 60 | - add_ldflags "-isysroot ${osx_sdk_dir}" |
| 61 | - fi |
| 62 | - ;; |
| 63 | - esac |
| 64 | - |
| 65 | - case ${toolchain} in |
| 66 | - *-darwin8-*) |
| 67 | - add_cflags "-mmacosx-version-min=10.4" |
| 68 | - add_ldflags "-mmacosx-version-min=10.4" |
| 69 | - ;; |
| 70 | - *-darwin9-*) |
| 71 | - add_cflags "-mmacosx-version-min=10.5" |
| 72 | - add_ldflags "-mmacosx-version-min=10.5" |
| 73 | - ;; |
| 74 | - *-darwin10-*) |
| 75 | - add_cflags "-mmacosx-version-min=10.6" |
| 76 | - add_ldflags "-mmacosx-version-min=10.6" |
| 77 | - ;; |
| 78 | - *-darwin11-*) |
| 79 | - add_cflags "-mmacosx-version-min=10.7" |
| 80 | - add_ldflags "-mmacosx-version-min=10.7" |
| 81 | - ;; |
| 82 | - *-darwin12-*) |
| 83 | - add_cflags "-mmacosx-version-min=10.8" |
| 84 | - add_ldflags "-mmacosx-version-min=10.8" |
| 85 | - ;; |
| 86 | - *-darwin13-*) |
| 87 | - add_cflags "-mmacosx-version-min=10.9" |
| 88 | - add_ldflags "-mmacosx-version-min=10.9" |
| 89 | - ;; |
| 90 | - *-darwin14-*) |
| 91 | - add_cflags "-mmacosx-version-min=10.10" |
| 92 | - add_ldflags "-mmacosx-version-min=10.10" |
| 93 | - ;; |
| 94 | - *-darwin15-*) |
| 95 | - add_cflags "-mmacosx-version-min=10.11" |
| 96 | - add_ldflags "-mmacosx-version-min=10.11" |
| 97 | - ;; |
| 98 | - *-darwin16-*) |
| 99 | - add_cflags "-mmacosx-version-min=10.12" |
| 100 | - add_ldflags "-mmacosx-version-min=10.12" |
| 101 | - ;; |
| 102 | - *-darwin17-*) |
| 103 | - add_cflags "-mmacosx-version-min=10.13" |
| 104 | - add_ldflags "-mmacosx-version-min=10.13" |
| 105 | - ;; |
| 106 | - *-iphonesimulator-*) |
| 107 | - add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}" |
| 108 | - add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}" |
| 109 | - iossim_sdk_dir="$(show_darwin_sdk_path iphonesimulator)" |
| 110 | - if [ -d "${iossim_sdk_dir}" ]; then |
| 111 | - add_cflags "-isysroot ${iossim_sdk_dir}" |
| 112 | - add_ldflags "-isysroot ${iossim_sdk_dir}" |
| 113 | - fi |
| 114 | - ;; |
| 115 | esac |
| 116 | |
| 117 | # Handle Solaris variants. Solaris 10 needs -lposix4 |
| 118 | }}} |
| 119 | |
| 120 | I've tested the revised patch and `libvpx` still built correctly |