diff options
| author | tsutsui <tsutsui@pkgsrc.org> | 2018-05-27 15:21:56 +0000 |
|---|---|---|
| committer | tsutsui <tsutsui@pkgsrc.org> | 2018-05-27 15:21:56 +0000 |
| commit | 41c09f75e174b3d4dcfe8b682042d107ef4041e3 (patch) | |
| tree | 30d0ecd583c81b40a117562596f66d445bea7d03 /multimedia | |
| parent | b8779e1d56ffb41af97aa6bb08da880c1bbfb0a4 (diff) | |
| download | pkgsrc-41c09f75e174b3d4dcfe8b682042d107ef4041e3.tar.gz | |
x264-devel: disable asm to avoid text relocations on NetBSD/i386 8.0.
Bump PKGREVISION. Ok'ed by wiz@ in PR pkg/53319.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/x264-devel/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index a3c4ff92365..17a92d6e66b 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.66 2018/04/25 19:25:12 fhajny Exp $ +# $NetBSD: Makefile,v 1.67 2018/05/27 15:21:56 tsutsui Exp $ DISTNAME= x264-snapshot-20180224-2245 PKGNAME= ${DISTNAME:S/-snapshot-/-devel-/:S/-2245$//} +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ EXTRACT_SUFX= .tar.bz2 @@ -14,8 +15,10 @@ LICENSE= gnu-gpl-v2 .include "../../mk/bsd.prefs.mk" # Assembler code still needs to be disabled on at least SunOS -.if ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= --disable-asm +# Also needs to avoid text relocations caused by non-pie x86 asm on NetBSD/i386 +.if ${OPSYS} == "SunOS" || \ + !empty(MACHINE_PLATFORM:MNetBSD-[89].*-i386) +CONFIGURE_ARGS+= --disable-asm .elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" BUILD_DEPENDS+= nasm>=2.13.0:../../devel/nasm .endif |