pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/SDL Don't try and do assembler on Solaris, it do...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8b2e8aad1354
branches:  trunk
changeset: 517132:8b2e8aad1354
user:      markd <markd%pkgsrc.org@localhost>
date:      Fri Aug 04 22:12:28 2006 +0000

description:
Don't try and do assembler on Solaris, it doesn't get it right.
Fixes PR pkg/31075.

diffstat:

 devel/SDL/Makefile |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 1f0ca049c005 -r 8b2e8aad1354 devel/SDL/Makefile
--- a/devel/SDL/Makefile        Fri Aug 04 21:06:59 2006 +0000
+++ b/devel/SDL/Makefile        Fri Aug 04 22:12:28 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2006/07/23 16:21:28 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2006/08/04 22:12:28 markd Exp $
 
 DISTNAME=      SDL-1.2.11
 PKGREVISION=   1
@@ -23,11 +23,13 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386" && ${OPSYS} != "SunOS"
 .  include "../../devel/binutils/buildlink3.mk"
 BUILD_DEPENDS+=                nasm>=0.98:../../devel/nasm
 NASMFLAGS_ELF=         -f elf
 NASMFLAGS_a.out=       -f aoutb
+.else
+CONFIGURE_ARGS+=       --disable-nasm
 .endif
 
 .if ${OPSYS:MNetBSD}



Home | Main Index | Thread Index | Old Index