summaryrefslogtreecommitdiff
path: root/devel/SDL
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2004-08-23 23:57:20 +0000
committerhubertf <hubertf@pkgsrc.org>2004-08-23 23:57:20 +0000
commite9c00e23b65f16d7db34dc926b873275c5f5be20 (patch)
tree29011897d7ffc44a69b36d1f027d00ca1ab00010 /devel/SDL
parentce5029e110a5f977bd5d182b8fe311173f24ae5d (diff)
downloadpkgsrc-e9c00e23b65f16d7db34dc926b873275c5f5be20.tar.gz
Don't pull in Mesa on IRIX - patch by Staffan Thomén (duck@IRC)
Diffstat (limited to 'devel/SDL')
-rw-r--r--devel/SDL/Makefile.common4
-rw-r--r--devel/SDL/buildlink3.mk6
2 files changed, 8 insertions, 2 deletions
diff --git a/devel/SDL/Makefile.common b/devel/SDL/Makefile.common
index 75e7a47d025..9537ab044f1 100644
--- a/devel/SDL/Makefile.common
+++ b/devel/SDL/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2004/05/04 21:58:43 grant Exp $
+# $NetBSD: Makefile.common,v 1.15 2004/08/23 23:57:20 hubertf Exp $
#
DISTNAME= SDL-1.2.7
@@ -62,7 +62,9 @@ AM_CFLAGS= -D_PATH_DEV_DSP=\\\"${DEVOSSAUDIO}\\\"
MAKE_ENV+= AM_CFLAGS="${AM_CFLAGS}"
.endif
+.if ${OPSYS} != "IRIX"
.include "../../graphics/Mesa/buildlink3.mk"
+.endif
.include "../../graphics/aalib-x11/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index e9a73d3514a..d2738282a25 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/23 04:37:38 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/08/23 23:57:20 hubertf Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_BUILDLINK3_MK:= ${SDL_BUILDLINK3_MK}+
@@ -18,7 +18,11 @@ BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL
USE_X11= yes
PTHREAD_OPTS+= require
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "IRIX"
.include "../../graphics/Mesa/buildlink3.mk"
+.endif
.include "../../graphics/aalib-x11/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"