CVS commit: pkgsrc/multimedia/x264-devel

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sun May 27 15:21:56 UTC 2018

Modified Files:
        pkgsrc/multimedia/x264-devel: Makefile

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/multimedia/x264-devel/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/x264-devel/Makefile
diff -u pkgsrc/multimedia/x264-devel/Makefile:1.66 pkgsrc/multimedia/x264-devel/Makefile:1.67
--- pkgsrc/multimedia/x264-devel/Makefile:1.66  Wed Apr 25 19:25:12 2018
+++ pkgsrc/multimedia/x264-devel/Makefile       Sun May 27 15:21:56 2018
@@ -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