From owner-svn-ports-head@freebsd.org  Sun Oct  8 18:57:20 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A248DE3D3AA;
 Sun,  8 Oct 2017 18:57:20 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3B4286FB57;
 Sun,  8 Oct 2017 18:57:20 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v98IvJ6l028131;
 Sun, 8 Oct 2017 18:57:19 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v98IvJ0p028130;
 Sun, 8 Oct 2017 18:57:19 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201710081857.v98IvJ0p028130@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sun, 8 Oct 2017 18:57:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r451560 - head/multimedia/libvpx
X-SVN-Group: ports-head
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: head/multimedia/libvpx
X-SVN-Commit-Revision: 451560
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Oct 2017 18:57:21 -0000

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