[pkgsrc/trunk]: pkgsrc/multimedia/libvpx Fix build on NetBSD/arm, at least on...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/295abf77d7db
branches:  trunk
changeset: 626372:295abf77d7db
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sat Nov 09 05:28:35 2013 +0000

description:
Fix build on NetBSD/arm, at least on NetBSD/evbearmv6hf-el 6.99.25

diffstat:

 multimedia/libvpx/Makefile         |   8 +++++++-
 multimedia/libvpx/distinfo         |   6 +++---
 multimedia/libvpx/patches/patch-aa |  22 ++++++++++++++++------
 multimedia/libvpx/patches/patch-ad |  11 ++++++++++-
 4 files changed, 36 insertions(+), 11 deletions(-)

diffs (137 lines):

diff -r 2606bad9daef -r 295abf77d7db multimedia/libvpx/Makefile
--- a/multimedia/libvpx/Makefile        Fri Nov 08 22:16:27 2013 +0000
+++ b/multimedia/libvpx/Makefile        Sat Nov 09 05:28:35 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2013/11/07 14:26:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2013/11/09 05:28:35 ryoon Exp $
 
 DISTNAME=      libvpx-v1.2.0
 PKGNAME=       ${DISTNAME:S/-v/-/}
@@ -36,6 +36,8 @@
                        examples/gen_example_text.sh \
                        examples/gen_example_code.sh
 
+REPLACE_PERL=          build/make/ads2gas.pl
+
 .if ${OPSYS} == "Darwin"
 BUILDLINK_TRANSFORM+=  rm:-Wl,-Bsymbolic
 .  if ${MACHINE_ARCH} == "i386"
@@ -72,6 +74,10 @@
 CONFIGURE_ARGS+=       --target=mips32-linux-gcc
 .endif
 
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
+CONFIGURE_ARGS+=       --disable-runtime-cpu-detect
+.endif
+
 BUILD_TARGET=  # none
 
 post-extract:
diff -r 2606bad9daef -r 295abf77d7db multimedia/libvpx/distinfo
--- a/multimedia/libvpx/distinfo        Fri Nov 08 22:16:27 2013 +0000
+++ b/multimedia/libvpx/distinfo        Sat Nov 09 05:28:35 2013 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.19 2013/09/13 15:00:43 joerg Exp $
+$NetBSD: distinfo,v 1.20 2013/11/09 05:28:35 ryoon Exp $
 
 SHA1 (libvpx-v1.2.0.tar.bz2) = 33fb2df4ee5b06637dc492dafe49425ead117a24
 RMD160 (libvpx-v1.2.0.tar.bz2) = ed43d99dd4a0166baf9caca7a50841ced695eb08
 Size (libvpx-v1.2.0.tar.bz2) = 1715462 bytes
-SHA1 (patch-aa) = 5b18ef2471039e2b3f9ba7818ed9372d03662cdd
+SHA1 (patch-aa) = efd541c9323b8d36272b57bffb1f95251a0a89f5
 SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b
 SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3
-SHA1 (patch-ad) = 274dc555219811c72b1f4a3298a0e9b1b300d169
+SHA1 (patch-ad) = 43215b6af634dc04a84e0eae89c10c83e7aff25c
 SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3
 SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
 SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe
diff -r 2606bad9daef -r 295abf77d7db multimedia/libvpx/patches/patch-aa
--- a/multimedia/libvpx/patches/patch-aa        Fri Nov 08 22:16:27 2013 +0000
+++ b/multimedia/libvpx/patches/patch-aa        Sat Nov 09 05:28:35 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2013/09/11 15:50:32 ryoon Exp $
+$NetBSD: patch-aa,v 1.7 2013/11/09 05:28:35 ryoon Exp $
 
 --- build/make/Makefile.orig   2013-09-04 18:49:22.000000000 +0000
 +++ build/make/Makefile
@@ -30,7 +30,17 @@
  
  $(BUILD_PFX)%.s.d: %.s
        $(if $(quiet),@echo "    [DEP] $@")
-@@ -211,13 +212,15 @@ define linker_template
+@@ -139,7 +140,8 @@ $(BUILD_PFX)%.s.d: %.s
+ 
+ $(BUILD_PFX)%.s.o: %.s
+       $(if $(quiet),@echo "    [AS] $@")
+-      $(qexec)$(AS) $(ASFLAGS) -o $@ $<
++      $(qexec)${LIBTOOL} --mode=compile --tag=CC sh strip_fPIC.sh \
++              $(AS) $(ASFLAGS) -o $@ $<
+ 
+ .PRECIOUS: %.c.S
+ %.c.S: CFLAGS += -DINLINE_ASM
+@@ -211,13 +213,15 @@ define linker_template
  $(1): $(filter-out -%,$(2))
  $(1):
        $(if $(quiet),@echo    "    [LD] $$@")
@@ -48,7 +58,7 @@
  endef
  # make-3.80 has a bug with expanding large input strings to the eval function,
  # which was triggered in some cases by the following component of
-@@ -230,8 +233,12 @@ endef
+@@ -230,8 +234,12 @@ endef
  define install_map_template
  $(DIST_DIR)/$(1): $(2)
        $(if $(quiet),@echo "    [INSTALL] $$@")
@@ -63,7 +73,7 @@
  endef
  
  define archive_template
-@@ -240,7 +247,9 @@ define archive_template
+@@ -240,7 +248,9 @@ define archive_template
  # for creating them.
  $(1):
        $(if $(quiet),@echo "    [AR] $$@")
@@ -74,7 +84,7 @@
  endef
  
  define so_template
-@@ -317,20 +326,20 @@ clean::
+@@ -317,20 +327,20 @@ clean::
        rm -f .bins .install-bins $(BINS)
  
  LIBS=$(call enabled,LIBS)
@@ -99,7 +109,7 @@
  
  ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
  PROJECTS=$(call enabled,PROJECTS)
-@@ -380,7 +389,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
+@@ -380,7 +390,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
      BUILD_TARGETS += .projects
      INSTALL_TARGETS += .install-projects
  endif
diff -r 2606bad9daef -r 295abf77d7db multimedia/libvpx/patches/patch-ad
--- a/multimedia/libvpx/patches/patch-ad        Fri Nov 08 22:16:27 2013 +0000
+++ b/multimedia/libvpx/patches/patch-ad        Sat Nov 09 05:28:35 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.9 2013/09/11 15:50:32 ryoon Exp $
+$NetBSD: patch-ad,v 1.10 2013/11/09 05:28:35 ryoon Exp $
 
 *BSD and qnx are identified as linux.
 Add another SDK path on Mac OS X.
@@ -14,6 +14,15 @@
                  tgt_os=linux
                  ;;
              *solaris2.10)
+@@ -775,7 +775,7 @@ process_common_toolchain() {
+ 
+         case ${tgt_cc} in
+         gcc)
+-            CROSS=${CROSS:-arm-none-linux-gnueabi-}
++#            CROSS=${CROSS:-arm-none-linux-gnueabi-}
+             link_with_cc=gcc
+             setup_gnu_toolchain
+             arch_int=${tgt_isa##armv}
 @@ -960,8 +960,6 @@ process_common_toolchain() {
              check_add_cflags -mips32r2 -mdspr2
              disable fast_unaligned