CVS commit: pkgsrc/multimedia/x265

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Oct 29 21:47:00 UTC 2020

Modified Files:
        pkgsrc/multimedia/x265: Makefile

Log Message:
x265: Avoid text relocations on i386

PR pkg/55766


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/multimedia/x265/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/x265/Makefile
diff -u pkgsrc/multimedia/x265/Makefile:1.30 pkgsrc/multimedia/x265/Makefile:1.31
--- pkgsrc/multimedia/x265/Makefile:1.30        Sat May 30 06:10:40 2020
+++ pkgsrc/multimedia/x265/Makefile     Thu Oct 29 21:47:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2020/05/30 06:10:40 adam Exp $
+# $NetBSD: Makefile,v 1.31 2020/10/29 21:47:00 nia Exp $
 
 DISTNAME=      x265_3.4
 PKGNAME=       ${DISTNAME:S/_/-/}
@@ -11,8 +11,14 @@ COMMENT=     High Efficiency Video Coding (H
 LICENSE=       gnu-gpl-v2
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/source
+
 .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS+=        nasm>=2.13.0:../../devel/nasm
+.  if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
+# Avoid text relocations
+CMAKE_ARGS+=   -DENABLE_ASSEMBLY+OFF
+.  else
+TOOL_DEPENDS+= nasm>=2.13.0:../../devel/nasm
+.  endif
 .endif
 
 CMAKE_ARGS+=   -DENABLE_PIC=ON