svn commit: r451560 - head/multimedia/libvpx

[Jan Beich]

Author: jbeich
Date: Sun Oct  8 18:57:19 2017
New Revision: 451560
URL: https://svnweb.freebsd.org/changeset/ports/451560

Log:
  multimedia/libvpx: adjust for real armv7 target
  
  NEON is currently enabled by default.

Modified:
  head/multimedia/libvpx/Makefile   (contents, props changed)

Modified: head/multimedia/libvpx/Makefile
==============================================================================
--- head/multimedia/libvpx/Makefile	Sun Oct  8 18:57:09 2017	(r451559)
+++ head/multimedia/libvpx/Makefile	Sun Oct  8 18:57:19 2017	(r451560)
@@ -28,11 +28,8 @@ CONFIGURE_ENV=	ASFLAGS="${ASFLAGS}"
 # Only explicitly list ARCHs with SIMD optimizations
 CONFIGURE_ARGS_aarch64=	--target=arm64-linux-gcc
 CONFIGURE_ARGS_amd64=	--target=x86_64-linux-gcc
+CONFIGURE_ARGS_armv7=	--target=armv7-linux-gcc
 CONFIGURE_ARGS_i386=	--target=x86-linux-gcc
-.if ${CFLAGS:M-march=armv[78]*}
-CONFIGURE_ARGS+=	--target=armv7-linux-gcc
-ASFLAGS+=		-meabi=5
-.endif
 CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}} \
 		--prefix=${PREFIX} \
 		--disable-install-docs \
@@ -41,12 +38,21 @@ CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}} \
 		--enable-vp8 \
 		--enable-vp9
 MAKE_ARGS+=	verbose=yes
+ASFLAGS+=	${ASFLAGS_${ARCH}}
+ASFLAGS_armv7=	-meabi=5
 ALL_TARGET=	# empty
 
+# armv7 is actually armv6 target before FreeBSD 12.0
+.if ${CFLAGS:M-march=armv7*}
+CONFIGURE_ARGS+=	${CONFIGURE_ARGS_armv7}
+ASFLAGS+=		${ASFLAGS_armv7}
+.endif
+
 OPTIONS_DEFINE=	DEBUG MULTIRES POSTPROC RTCPU SHARED SIZE_LIMIT TEST THREADS
 OPTIONS_DEFAULT=MULTIRES POSTPROC RTCPU SHARED SIZE_LIMIT THREADS
 OPTIONS_EXCLUDE_aarch64=RTCPU
 OPTIONS_EXCLUDE_armv6=	RTCPU
+OPTIONS_EXCLUDE_armv7=	RTCPU
 OPTIONS_SUB=		SHARED
 
 DEBUG_CONFIGURE_ON=	--enable-debug