Mon Dec 27 20:24:03 2021 UTC ()
Don't --disable-asm on Darwin-*-aarch64. At least on Monterey 12.1,
--disable-asm makes the build fail with undefined symbols largely
matching "*_asm" or "*_aarch64". Simply removing it from CONFIGURE_ARGS
lets the build succeed.

(If --disable-asm turns out to be needed for older macOS/aarch64, we can
bring it back conditionalized on OS_VERSION.)


(schmonz)
diff -r1.80 -r1.81 pkgsrc/multimedia/x264-devel/Makefile
cvs diff -r1.80 -r1.81 pkgsrc/multimedia/x264-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/Makefile 2021/11/24 17:31:01 1.80
+++ pkgsrc/multimedia/x264-devel/Attic/Makefile 2021/12/27 20:24:03 1.81
@@ -1,35 +1,34 @@ @@ -1,35 +1,34 @@
1# $NetBSD: Makefile,v 1.80 2021/11/24 17:31:01 nia Exp $ 1# $NetBSD: Makefile,v 1.81 2021/12/27 20:24:03 schmonz Exp $
2 2
3DISTNAME= x264-snapshot-20191217-2245 3DISTNAME= x264-snapshot-20191217-2245
4PKGNAME= ${DISTNAME:S/-snapshot-/-devel-/:S/-2245$//} 4PKGNAME= ${DISTNAME:S/-snapshot-/-devel-/:S/-2245$//}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ 7MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= https://www.videolan.org/developers/x264.html 11HOMEPAGE= https://www.videolan.org/developers/x264.html
12COMMENT= GPL licensed H.264 encoder 12COMMENT= GPL licensed H.264 encoder
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16 16
17# Assembler code still needs to be disabled on at least SunOS. 17# Assembler code still needs to be disabled on at least SunOS.
18# NetBSD/i386 needs ASM disabled to avoid text relocations. 18# NetBSD/i386 needs ASM disabled to avoid text relocations.
19# NetBSD/mips needs ASM disabled because it uses the MSA extension 19# NetBSD/mips needs ASM disabled because it uses the MSA extension
20# (requires MIPS64 revision 2) and fails to build. 20# (requires MIPS64 revision 2) and fails to build.
21.if ${OPSYS} == "SunOS" || \ 21.if ${OPSYS} == "SunOS" || \
22 !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) || \ 
23 !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \ 22 !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
24 !empty(MACHINE_PLATFORM:MNetBSD-*-mips*) 23 !empty(MACHINE_PLATFORM:MNetBSD-*-mips*)
25CONFIGURE_ARGS+= --disable-asm 24CONFIGURE_ARGS+= --disable-asm
26.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 25.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
27TOOL_DEPENDS+= nasm>=2.13.0:../../devel/nasm 26TOOL_DEPENDS+= nasm>=2.13.0:../../devel/nasm
28.endif 27.endif
29 28
30USE_TOOLS+= bash gmake 29USE_TOOLS+= bash gmake
31USE_LIBTOOL= yes 30USE_LIBTOOL= yes
32HAS_CONFIGURE= yes 31HAS_CONFIGURE= yes
33CONFIG_SHELL= ${BASH} 32CONFIG_SHELL= ${BASH}
34CONFIGURE_ARGS+= --enable-shared 33CONFIGURE_ARGS+= --enable-shared
35CONFIGURE_ARGS+= --enable-static 34CONFIGURE_ARGS+= --enable-static