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

[Jan Beich]

Author: jbeich
Date: Tue Apr 10 00:13:03 2018
New Revision: 466920
URL: https://svnweb.freebsd.org/changeset/ports/466920

Log:
  multimedia/libvpx: drop explicit targets
  
  PR:		224107

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

Modified: head/multimedia/libvpx/Makefile
==============================================================================
--- head/multimedia/libvpx/Makefile	Tue Apr 10 00:12:43 2018	(r466919)
+++ head/multimedia/libvpx/Makefile	Tue Apr 10 00:13:03 2018	(r466920)
@@ -24,27 +24,20 @@ USE_PERL5=	build
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	build/make/ads2gas.pl
 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
-CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}} \
-		--prefix=${PREFIX} \
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--disable-install-docs \
 		--disable-install-srcs \
 		--enable-pic \
 		--enable-vp8 \
 		--enable-vp9
 MAKE_ARGS+=	verbose=yes
-ASFLAGS+=	${ASFLAGS_${ARCH}}
-ASFLAGS_armv7=	-meabi=5
+ASFLAGS+=	${ASFLAGS_${MACHINE}}
+ASFLAGS_arm=	-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}
+CONFIGURE_ARGS+=	--target=armv7-linux-gcc
 .endif
 
 OPTIONS_DEFINE=	DEBUG MULTIRES POSTPROC RTCPU SHARED SIZE_LIMIT TEST THREADS
@@ -76,7 +69,7 @@ TEST_CONFIGURE_OFF=	--disable-unit-tests
 THREADS_CONFIGURE_OFF=	--disable-multithread
 
 post-patch:
-	@${REINPLACE_CMD} 's|\(link_with_cc\)=gcc|\1=$${CC}|' \
+	@${REINPLACE_CMD} -E '/gcctarget|link_with_cc/s/gcc[[:>:]]/$${CC}/' \
 		${WRKSRC}/build/make/configure.sh
 	@${REINPLACE_CMD} 's|sparc-solaris-gcc|sparc-linux-gcc|' \
 		${WRKSRC}/configure

Added: head/multimedia/libvpx/files/patch-build_make_configure.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/libvpx/files/patch-build_make_configure.sh	Tue Apr 10 00:13:03 2018	(r466920)
@@ -0,0 +1,13 @@
+- Recognize DragonFly as x86_64-linux-gcc target by default
+
+--- build/make/configure.sh.orig	2018-01-24 22:25:44 UTC
++++ build/make/configure.sh
+@@ -767,7 +767,7 @@ process_common_toolchain() {
+         [ -z "$tgt_isa" ] && tgt_isa=x86
+         tgt_os=win32
+         ;;
+-      *linux*|*bsd*)
++      *linux*|*dragonfly*|*bsd*)
+         tgt_os=linux
+         ;;
+       *solaris2.10)