[pkgsrc/trunk]: pkgsrc/multimedia/xvidcore disable asm on Solaris, as the res...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/058a3b505b20
branches:  trunk
changeset: 519832:058a3b505b20
user:      grant <grant%pkgsrc.org@localhost>
date:      Wed Oct 11 00:04:39 2006 +0000

description:
disable asm on Solaris, as the resulting object files don't link
correctly.

diffstat:

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

diffs (26 lines):

diff -r a04d3e648c66 -r 058a3b505b20 multimedia/xvidcore/Makefile
--- a/multimedia/xvidcore/Makefile      Wed Oct 11 00:01:00 2006 +0000
+++ b/multimedia/xvidcore/Makefile      Wed Oct 11 00:04:39 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/10/09 12:52:35 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/10/11 00:04:39 grant Exp $
 
 DISTNAME=      xvidcore-1.1.0
 PKGREVISION=   3
@@ -14,10 +14,13 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS+=        nasm>=0.98.34:../../devel/nasm
+# the resulting objects from the asm don't link correctly on Solaris.
+.if ${OPSYS} == "SunOS"
+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
+BUILD_DEPENDS+=                yasm>=0.4.0:../../devel/yasm
 .endif
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews