Changeset 79339

Timestamp:

06/09/11 13:42:50 (4 years ago)

Author:

jeremyhu@…

Message:

libvpx: darwin11 buildfix

Location:

trunk/dports/multimedia/libvpx/files

Files:

• patch-build-make-configure.sh.diff (modified) (2 diffs)
• patch-configure.diff (modified) (3 diffs)

trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff

@@ -14 +14 @@
      fi
  
-@@ -603,21 +603,21 @@
+@@ -603,21 +603,27 @@
      # Handle darwin variants
      case ${toolchain} in
@@ -41 +41 @@
              add_ldflags "-mmacosx-version-min=10.6"
              ;;
++        *-darwin11-*)
++            add_cflags  "-isysroot @DEVELOPER_DIR@/SDKs/MacOSX10.7.sdk"
++            add_cflags  "-mmacosx-version-min=10.7"
++            add_ldflags "-isysroot @DEVELOPER_DIR@/SDKs/MacOSX10.7.sdk"
++            add_ldflags "-mmacosx-version-min=10.7"
++            ;;
      esac

trunk/dports/multimedia/libvpx/files/patch-configure.diff

@@ -1 +1 @@
 --- configure.orig      2011-03-04 14:40:37.000000000 -0600
 +++ configure   2011-03-12 14:44:34.000000000 -0600
-@@ -105,6 +105,8 @@
+@@ -105,6 +105,10 @@
  all_platforms="${all_platforms} x86-darwin8-icc"
  all_platforms="${all_platforms} x86-darwin9-gcc"
@@ -7 +7 @@
 +all_platforms="${all_platforms} x86-darwin10-gcc"
 +all_platforms="${all_platforms} x86-darwin10-icc"
++all_platforms="${all_platforms} x86-darwin11-gcc"
++all_platforms="${all_platforms} x86_64-darwin11-gcc"
  all_platforms="${all_platforms} x86-linux-gcc"
  all_platforms="${all_platforms} x86-linux-icc"
  all_platforms="${all_platforms} x86-solaris-gcc"
-@@ -121,6 +123,7 @@
+@@ -121,6 +123,8 @@
  all_platforms="${all_platforms} x86_64-win64-vs9"
  all_platforms="${all_platforms} universal-darwin8-gcc"
  all_platforms="${all_platforms} universal-darwin9-gcc"
 +all_platforms="${all_platforms} universal-darwin10-gcc"
++all_platforms="${all_platforms} universal-darwin11-gcc"
  all_platforms="${all_platforms} generic-gnu"
  
  # all_targets is a list of all targets that can be configured
-@@ -466,12 +469,20 @@
+@@ -466,12 +469,25 @@
      case $toolchain in
          universal-darwin*)
@@ -42 +45 @@
 +               fat_bin_archs="$fat_bin_archs x86-${tgt_os}-${tgt_cc}"
 +               fat_bin_archs="$fat_bin_archs x86_64-${tgt_os}-${tgt_cc}"
++            fi
++            if [ $darwin_ver -eq 11 ]; then
++               # x86 and x86_64 are defaults for universal on 10.7
++               fat_bin_archs="$fat_bin_archs x86-${tgt_os}-${tgt_cc}"
++               fat_bin_archs="$fat_bin_archs x86_64-${tgt_os}-${tgt_cc}"
              fi
              ;;