[pkgsrc/trunk]: pkgsrc/multimedia/x264-devel x264-devel: disable asm to avoid...

[tsutsui <tsutsui%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b81f8eb6c0c5
branches:  trunk
changeset: 308630:b81f8eb6c0c5
user:      tsutsui <tsutsui%pkgsrc.org@localhost>
date:      Sun May 27 15:21:56 2018 +0000

description:
x264-devel: disable asm to avoid text relocations on NetBSD/i386 8.0.

Bump PKGREVISION.  Ok'ed by wiz@ in PR pkg/53319.

diffstat:

 multimedia/x264-devel/Makefile |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 316bc0f3df78 -r b81f8eb6c0c5 multimedia/x264-devel/Makefile
--- a/multimedia/x264-devel/Makefile    Sun May 27 15:21:09 2018 +0000
+++ b/multimedia/x264-devel/Makefile    Sun May 27 15:21:56 2018 +0000
@@ -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 @@
 .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