From owner-svn-ports-head@freebsd.org Tue Apr 10 00:13:04 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3BAC9F8A7F7; Tue, 10 Apr 2018 00:13:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E192F703DE; Tue, 10 Apr 2018 00:13:03 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C3E1525E1A; Tue, 10 Apr 2018 00:13:03 +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 w3A0D38r062775; Tue, 10 Apr 2018 00:13:03 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3A0D3V4062773; Tue, 10 Apr 2018 00:13:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804100013.w3A0D3V4062773@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 10 Apr 2018 00:13:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466920 - in head/multimedia/libvpx: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/multimedia/libvpx: . files X-SVN-Commit-Revision: 466920 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.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2018 00:13:04 -0000 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)