From 6dcc45bd58004092c37a3359bb5f24928ee365dc Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Wed, 11 Oct 2006 00:04:39 +0000
Subject: disable asm on Solaris, as the resulting object files don't link
 correctly.

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

(limited to 'multimedia/xvidcore')

diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index 9ad32cba5cd..b21f35c1a9f 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -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 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .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
-- 
cgit v1.2.3