svn commit: r374472 - in head/multimedia/libvpx: . files

[Ashish SHUKLA]

Author: ashish
Date: Wed Dec 10 15:47:19 2014
New Revision: 374472
URL: https://svnweb.freebsd.org/changeset/ports/374472
QAT: https://qat.redports.org/buildarchive/r374472/

Log:
  - Add support for building on ARMv6 platforms
  
  Thanks to sbruno@ for testing the port build on ARMv6
  
  PR:		195466
  Submitted by:	mikael.urankar <mikael.urankar at gmail dot com>

Added:
  head/multimedia/libvpx/files/extra-patch-build_make_Makefile   (contents, props changed)
Modified:
  head/multimedia/libvpx/Makefile
  head/multimedia/libvpx/files/patch-build_make_configure.sh

Modified: head/multimedia/libvpx/Makefile
==============================================================================
--- head/multimedia/libvpx/Makefile	Wed Dec 10 15:39:38 2014	(r374471)
+++ head/multimedia/libvpx/Makefile	Wed Dec 10 15:47:19 2014	(r374472)
@@ -23,6 +23,7 @@ USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DEBUG POSTPROC RUNTIME THREADS SHARED
 OPTIONS_DEFAULT=	POSTPROC RUNTIME THREADS SHARED
+OPTIONS_EXCLUDE_armv6=	RUNTIME
 POSTPROC_DESC=	Enable postprocessing
 RUNTIME_DESC=	Enable runtime CPU detection
 SHARED_DESC=	Enable shared-library support
@@ -74,6 +75,9 @@ CONFIGURE_ARGS+=	--target=ia64-linux-gcc
 CONFIGURE_ARGS+=	--target=ppc32-linux-gcc
 .elif ${ARCH} == "powerpc64"
 CONFIGURE_ARGS+=	--target=ppc64-linux-gcc
+.elif ${ARCH} == "armv6"
+CONFIGURE_ARGS+=	--target=armv6-linux-gcc --cpu=armv6
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-build_make_Makefile
 .else
 IGNORE=	no support for ${ARCH} the moment. testing/patches are welcome
 .endif

Added: head/multimedia/libvpx/files/extra-patch-build_make_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/libvpx/files/extra-patch-build_make_Makefile	Wed Dec 10 15:47:19 2014	(r374472)
@@ -0,0 +1,11 @@
+--- build/make/Makefile.orig	2013-11-18 22:18:52 UTC
++++ build/make/Makefile
+@@ -68,7 +68,7 @@ BUILD_ROOT?=.
+ VPATH=$(SRC_PATH_BARE)
+ CFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT) -I$(SRC_PATH)
+ CXXFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT) -I$(SRC_PATH)
+-ASFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT)/ -I$(SRC_PATH)/
++ASFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT)/ -I$(SRC_PATH)/ -meabi=5
+ DIST_DIR?=dist
+ HOSTCC?=gcc
+ TGT_ISA:=$(word 1, $(subst -, ,$(TOOLCHAIN)))

Modified: head/multimedia/libvpx/files/patch-build_make_configure.sh
==============================================================================
--- head/multimedia/libvpx/files/patch-build_make_configure.sh	Wed Dec 10 15:39:38 2014	(r374471)
+++ head/multimedia/libvpx/files/patch-build_make_configure.sh	Wed Dec 10 15:47:19 2014	(r374472)
@@ -1,3 +1,13 @@
+--- build/make/configure.sh.orig	2014-11-27 18:00:48 UTC
++++ build/make/configure.sh
+@@ -799,7 +799,6 @@ process_common_toolchain() {
+ 
+         case ${tgt_cc} in
+         gcc)
+-            CROSS=${CROSS:-arm-none-linux-gnueabi-}
+             link_with_cc=gcc
+             setup_gnu_toolchain
+             arch_int=${tgt_isa##armv}
 $FreeBSD$
 
 --- build/make/configure.sh.orig	2014-12-03 18:11:14.000000000 +0100