NetBSD ARMv7 hardfloat build fix

2 files changed, 21 insertions, 11 deletions

diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index 1385c398d8a..0b8d65bb209 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2014/05/15 12:00:04 martin Exp $
+$NetBSD: distinfo,v 1.26 2014/11/14 11:51:01 jmcneill Exp $
 
 SHA1 (libvpx_1.3.0.orig.tar.bz2) = fd90afbdba7905b9b3ab6c707c41369627d208e9
 RMD160 (libvpx_1.3.0.orig.tar.bz2) = f90e26d7657b26d8a3bdba82c55db5ecafc23835
@@ -6,7 +6,7 @@ Size (libvpx_1.3.0.orig.tar.bz2) = 2077846 bytes
 SHA1 (patch-aa) = a34e812f51c9fbd6ae99d48d1e23bcf922cf0ac0
 SHA1 (patch-ab) = dfd61002748f01a5651dc58ce6f67a9906f9a456
 SHA1 (patch-ac) = 2086b1896c6c6a23ba7da75824375fae0bdb97d1
-SHA1 (patch-ad) = 7fdc981b9a38d9e75f6b9b1e8084aa4d278579c9
+SHA1 (patch-ad) = e63453d0d13ddbcbf243ece9818bbc9e1bd174b5
 SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3
 SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
 SHA1 (patch-configure) = de25f725eb4fb693b663022fdc977ed87c1863cd
diff --git a/multimedia/libvpx/patches/patch-ad b/multimedia/libvpx/patches/patch-ad
index eee08414f11..b0361a123c5 100644
--- a/multimedia/libvpx/patches/patch-ad
+++ b/multimedia/libvpx/patches/patch-ad
@@ -1,12 +1,22 @@
-$NetBSD: patch-ad,v 1.15 2014/05/15 12:00:04 martin Exp $
+$NetBSD: patch-ad,v 1.16 2014/11/14 11:51:01 jmcneill Exp $
 
 *BSD and qnx are identified as linux.
 Add another SDK path on Mac OS X.
 All sparc cpus can not do unaligned access.
+Detect NetBSD ARMv7 hardfloat toolchain.
 
---- build/make/configure.sh.orig	2013-12-17 18:05:18.000000000 +0100
-+++ build/make/configure.sh	2014-05-15 13:11:08.000000000 +0200
-@@ -665,7 +665,7 @@
+--- build/make/configure.sh.orig	2013-12-17 17:05:18.000000000 +0000
++++ build/make/configure.sh
+@@ -604,7 +604,7 @@ process_common_toolchain() {
+             armv6*)
+                 tgt_isa=armv6
+                 ;;
+-            armv7*-hardfloat*)
++            armv7*-hardfloat*|armv7*-netbsd*-*hf)
+                 tgt_isa=armv7
+                 float_abi=hard
+                 ;;
+@@ -665,7 +665,7 @@ process_common_toolchain() {
                  [ -z "$tgt_isa" ] && tgt_isa=x86
                  tgt_os=win32
                  ;;
@@ -15,7 +25,7 @@ All sparc cpus can not do unaligned access.
                  tgt_os=linux
                  ;;
              *solaris2.10)
-@@ -704,6 +704,7 @@
+@@ -704,6 +704,7 @@ process_common_toolchain() {
      case ${tgt_isa} in
          arm*) enable_feature arm;;
          mips*) enable_feature mips;;
@@ -23,7 +33,7 @@ All sparc cpus can not do unaligned access.
      esac
  
      # PIC is probably what we want when building shared libs
-@@ -799,7 +800,7 @@
+@@ -799,7 +800,7 @@ process_common_toolchain() {
  
          case ${tgt_cc} in
          gcc)
@@ -32,7 +42,7 @@ All sparc cpus can not do unaligned access.
              link_with_cc=gcc
              setup_gnu_toolchain
              arch_int=${tgt_isa##armv}
-@@ -988,8 +989,6 @@
+@@ -988,8 +989,6 @@ EOF
              check_add_cflags -mips32r2 -mdspr2
              disable_feature fast_unaligned
          fi
@@ -41,7 +51,7 @@ All sparc cpus can not do unaligned access.
          check_add_asflags -KPIC
      ;;
      ppc*)
-@@ -1219,7 +1218,7 @@
+@@ -1219,7 +1218,7 @@ EOF
      check_cc <<EOF
      unsigned int e = 'O'<<24 | '2'<<16 | 'B'<<8 | 'E';
  EOF
@@ -50,7 +60,7 @@ All sparc cpus can not do unaligned access.
          grep '4f *32 *42 *45' >/dev/null 2>&1 && enable_feature big_endian
  
      # Try to find which inline keywords are supported
-@@ -1235,10 +1234,32 @@
+@@ -1235,10 +1234,32 @@ EOF
          case ${toolchain} in
              *-win*-vs*);;
              *-android-gcc);;