From b7b70efc15b627352039b475b3a7df2caef8bc73 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Thu, 19 Oct 2006 00:15:15 +0000
Subject: Disable assembly code on x86_64 -- the asm is not PIC, but the ABI
 demands PIC code. This fixes the build.

A big patch to make the asm PIC is available from gentoo at
http://bugs.gentoo.org/show_bug.cgi?id=90287
in case someone knowledgable is interested in verifying and integrating it.
---
 multimedia/xvidcore/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'multimedia/xvidcore/Makefile')

diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index b21f35c1a9f..1e549a46815 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/10/11 00:04:39 grant Exp $
+# $NetBSD: Makefile,v 1.24 2006/10/19 00:15:15 wiz Exp $
 
 DISTNAME=	xvidcore-1.1.0
 PKGREVISION=	3
@@ -15,12 +15,15 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../mk/bsd.prefs.mk"
 
 # the resulting objects from the asm don't link correctly on Solaris.
-.if ${OPSYS} == "SunOS"
+# nor on amd64 -- they are not PIC, but the ABI demands it
+# big patch available from Gentoo, if someone is interested:
+# http://bugs.gentoo.org/show_bug.cgi?id=90287
+.if ${OPSYS} == "SunOS" || ${MACHINE_ARCH} == "x86_64"
 CONFIGURE_ARGS+=	--disable-assembly
 .elif ${MACHINE_ARCH} == "i386"
 BUILD_DEPENDS+=		nasm>=0.98.34:../../devel/nasm
-.elif ${MACHINE_ARCH} == "x86_64"
-BUILD_DEPENDS+=		yasm>=0.4.0:../../devel/yasm
+#.elif ${MACHINE_ARCH} == "x86_64"
+#BUILD_DEPENDS+=		yasm>=0.4.0:../../devel/yasm
 .endif
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-- 
cgit v1.2.3