Thu May 10 21:10:38 2018 UTC ()
Disable runtime CPU detection on NetBSD/aarch64


(jmcneill)
diff -r1.72 -r1.73 pkgsrc/multimedia/libvpx/Makefile
cvs diff -r1.72 -r1.73 pkgsrc/multimedia/libvpx/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/Makefile 2018/01/28 16:04:11 1.72
+++ pkgsrc/multimedia/libvpx/Makefile 2018/05/10 21:10:38 1.73
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.72 2018/01/28 16:04:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.73 2018/05/10 21:10:38 jmcneill Exp $
2 2
3DISTNAME= libvpx-1.7.0 3DISTNAME= libvpx-1.7.0
4CATEGORIES= multimedia 4CATEGORIES= multimedia
5MASTER_SITES= ${MASTER_SITE_GITHUB:=webmproject/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=webmproject/}
6GITHUB_PROJECT= libvpx 6GITHUB_PROJECT= libvpx
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= https://chromium.googlesource.com/webm/libvpx 10HOMEPAGE= https://chromium.googlesource.com/webm/libvpx
11COMMENT= On2 VP8 library from Google 11COMMENT= On2 VP8 library from Google
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_LANGUAGES= c c++11 14USE_LANGUAGES= c c++11
@@ -92,27 +92,27 @@ SUBST_CLASSES+= clang @@ -92,27 +92,27 @@ SUBST_CLASSES+= clang
92SUBST_STAGE.clang= pre-configure 92SUBST_STAGE.clang= pre-configure
93SUBST_FILES.clang= build/make/Makefile 93SUBST_FILES.clang= build/make/Makefile
94SUBST_MESSAGE.clang= Disabling clang integrated assembler 94SUBST_MESSAGE.clang= Disabling clang integrated assembler
95# Test for whether clang supports -fno-integrated-as instead of -no-integrated-as 95# Test for whether clang supports -fno-integrated-as instead of -no-integrated-as
96CLANG_INTEGRATED_AS!= if ${CCPATH:Utrue} --version -fno-integrated-as > /dev/null 2>&1; then ${ECHO} "-fno-integrated-as"; else ${ECHO} "-no-integrated-as"; fi 96CLANG_INTEGRATED_AS!= if ${CCPATH:Utrue} --version -fno-integrated-as > /dev/null 2>&1; then ${ECHO} "-fno-integrated-as"; else ${ECHO} "-no-integrated-as"; fi
97SUBST_SED.clang= -e 's/-DINLINE_ASM/-DINLINE_ASM ${CLANG_INTEGRATED_AS}/' 97SUBST_SED.clang= -e 's/-DINLINE_ASM/-DINLINE_ASM ${CLANG_INTEGRATED_AS}/'
98. endif 98. endif
99.endif 99.endif
100 100
101.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipsel" 101.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipsel"
102CONFIGURE_ARGS+= --target=mips32-linux-gcc 102CONFIGURE_ARGS+= --target=mips32-linux-gcc
103.endif 103.endif
104 104
105.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) 105.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) || !empty(MACHINE_PLATFORM:MNetBSD-*-*aarch64*)
106CONFIGURE_ARGS+= --disable-runtime-cpu-detect 106CONFIGURE_ARGS+= --disable-runtime-cpu-detect
107.endif 107.endif
108 108
109BUILDLINK_TRANSFORM.MirBSD+= rm:-lrt 109BUILDLINK_TRANSFORM.MirBSD+= rm:-lrt
110# Compiler is too old for these newfangled features 110# Compiler is too old for these newfangled features
111CONFIGURE_ENV.MirBSD+= sse2=no sse3=no ssse3=no sse4_1=no 111CONFIGURE_ENV.MirBSD+= sse2=no sse3=no ssse3=no sse4_1=no
112# runtime_cpu_detect=no 112# runtime_cpu_detect=no
113CONFIGURE_ENV.MirBSD+= RTCD_OPTIONS='--disable-sse2 --disable-sse3 --disable-ssse3 --disable-sse4_1' 113CONFIGURE_ENV.MirBSD+= RTCD_OPTIONS='--disable-sse2 --disable-sse3 --disable-ssse3 --disable-sse4_1'
114CONFIGURE_ARGS.MirBSD+= --disable-runtime-cpu-detect 114CONFIGURE_ARGS.MirBSD+= --disable-runtime-cpu-detect
115 115
116# Under Solaris 10 its /usr/xpg4/bin/tr is not sufficient. PR pkg/48508 116# Under Solaris 10 its /usr/xpg4/bin/tr is not sufficient. PR pkg/48508
117.if !empty(MACHINE_PLATFORM:MSunOS-5.10*) 117.if !empty(MACHINE_PLATFORM:MSunOS-5.10*)
118BUILD_DEPENDS= coreutils-[0-9]*:../../sysutils/coreutils 118BUILD_DEPENDS= coreutils-[0-9]*:../../sysutils/coreutils