diff options
author | tnn <tnn> | 2008-02-08 10:34:19 +0000 |
---|---|---|
committer | tnn <tnn> | 2008-02-08 10:34:19 +0000 |
commit | 10620be7c53dd97c16f8696d4b334c5c31affedc (patch) | |
tree | 36062df675f9d133992b3e8ab1a488e16c8cef6e /graphics | |
parent | 7927f4a6333d8926a24ca9e8dc43d98467631333 (diff) | |
download | pkgsrc-10620be7c53dd97c16f8696d4b334c5c31affedc.tar.gz |
Fix more cases of non-chainable PKGSRC_COMPILER tests.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/netpbm/Makefile | 4 | ||||
-rw-r--r-- | graphics/netpbm/hacks.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 98c15441171..85e92ad58d0 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.155 2007/09/08 21:57:58 jlam Exp $ +# $NetBSD: Makefile,v 1.156 2008/02/08 10:34:19 tnn Exp $ DISTNAME= netpbm-10.34 PKGREVISION= 1 @@ -63,7 +63,7 @@ MAKE_ENV+= NETPBMLIBTYPE="unixshared" NETPBMLIBSUFFIX="sl" MAKE_ENV+= NETPBMLIBTYPE="unixshared" NETPBMLIBSUFFIX="so" .endif -.if ${PKGSRC_COMPILER} == "ido" +.if !empty(PKGSRC_COMPILER:Mido) CPPFLAGS+= -DSGI_IDO_CC .endif diff --git a/graphics/netpbm/hacks.mk b/graphics/netpbm/hacks.mk index f4ea4ef62b7..ee8c8cd6aa2 100644 --- a/graphics/netpbm/hacks.mk +++ b/graphics/netpbm/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.6 2007/10/16 23:48:59 tnn Exp $ +# $NetBSD: hacks.mk,v 1.7 2008/02/08 10:34:19 tnn Exp $ .if !defined(NETPBM_HACKS_MK) NETPBM_HACKS_MK= # defined @@ -38,7 +38,7 @@ post-wrapper: ### work around bug in Apple's gcc-4.0.0 ### that shows up when compiling frame.c ### -.if ${OPSYS} == "Darwin" && ${PKGSRC_COMPILER} == "gcc" +.if ${OPSYS} == "Darwin" && !empty(PKGSRC_COMPILER:Mgcc) _BAD_GCC_BUILD!= ${CC} --version | (${GREP} -c '^powerpc-apple-darwin8-gcc-4\.0\.0.*build\ 4061' || ${TRUE}) . if ${_BAD_GCC_BUILD} == "1" PKG_HACKS+= apple-gcc-4-bug |