diff options
| author | jbeich <jbeich@FreeBSD.org> | 2018-04-10 08:13:03 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2018-04-10 08:13:03 +0800 |
| commit | 68b5d2aa6b4793e8dfc14204d0a28668ad6cc7dc (patch) | |
| tree | 81e8e1dfeec8d22290eec269546282fd7ae6ec76 /multimedia/libvpx | |
| parent | 577af9ab79d39a660cefe228076cd22fa294b416 (diff) | |
| download | freebsd-ports-gnome-68b5d2aa6b4793e8dfc14204d0a28668ad6cc7dc.tar.gz freebsd-ports-gnome-68b5d2aa6b4793e8dfc14204d0a28668ad6cc7dc.tar.zst freebsd-ports-gnome-68b5d2aa6b4793e8dfc14204d0a28668ad6cc7dc.zip | |
multimedia/libvpx: drop explicit targets
PR: 224107
Diffstat (limited to 'multimedia/libvpx')
| -rw-r--r-- | multimedia/libvpx/Makefile | 17 | ||||
| -rw-r--r-- | multimedia/libvpx/files/patch-build_make_configure.sh | 13 |
2 files changed, 18 insertions, 12 deletions
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile index 8477862eb91f..53612c20a333 100644 --- a/multimedia/libvpx/Makefile +++ b/multimedia/libvpx/Makefile @@ -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 diff --git a/multimedia/libvpx/files/patch-build_make_configure.sh b/multimedia/libvpx/files/patch-build_make_configure.sh new file mode 100644 index 000000000000..1bb449b72187 --- /dev/null +++ b/multimedia/libvpx/files/patch-build_make_configure.sh @@ -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) |