[pkgsrc/trunk]: pkgsrc/multimedia/xvidcore Disable assembly code on x86_64 --...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b15aed241e7d
branches:  trunk
changeset: 520308:b15aed241e7d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Oct 19 00:15:15 2006 +0000

description:
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.

diffstat:

 multimedia/xvidcore/Makefile |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 4a0fb78becb8 -r b15aed241e7d multimedia/xvidcore/Makefile
--- a/multimedia/xvidcore/Makefile      Thu Oct 19 00:13:42 2006 +0000
+++ b/multimedia/xvidcore/Makefile      Thu Oct 19 00:15:15 2006 +0000
@@ -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 @@
 .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