pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/x265 x265: Avoid text relocations on i386
details: https://anonhg.NetBSD.org/pkgsrc/rev/e4ebd87d594c
branches: trunk
changeset: 441223:e4ebd87d594c
user: nia <nia%pkgsrc.org@localhost>
date: Thu Oct 29 21:47:00 2020 +0000
description:
x265: Avoid text relocations on i386
PR pkg/55766
diffstat:
multimedia/x265/Makefile | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diffs (25 lines):
diff -r 8bd44dcf3926 -r e4ebd87d594c multimedia/x265/Makefile
--- a/multimedia/x265/Makefile Thu Oct 29 19:47:13 2020 +0000
+++ b/multimedia/x265/Makefile Thu Oct 29 21:47:00 2020 +0000
@@ -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 @@
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
Home |
Main Index |
Thread Index |
Old Index