diff options
| author | joerg <joerg> | 2007-02-15 14:29:54 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-02-15 14:29:54 +0000 |
| commit | 7b64c45f89097dbc1a4f10363fc43ec310af16c4 (patch) | |
| tree | fb4c7ba51203cd3fe4d2e0f6aaf3de2a4075b95b /multimedia | |
| parent | 90fff3ae52577125aae15c38b344ea1e9a4495aa (diff) | |
| download | pkgsrc-7b64c45f89097dbc1a4f10363fc43ec310af16c4.tar.gz | |
Don't include x11.b3.mk explicitly. Disable propolice on DragonFly.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gnash/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/gnash/hacks.mk | 18 |
2 files changed, 19 insertions, 2 deletions
diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile index c944b5e4ad6..7b79ed900ca 100644 --- a/multimedia/gnash/Makefile +++ b/multimedia/gnash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2007/01/17 23:47:22 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2007/02/15 14:29:54 joerg Exp $ # DISTNAME= gnash-0.7.2 @@ -41,5 +41,4 @@ PLIST_SRC+= ${PKGDIR}/PLIST .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/gnash/hacks.mk b/multimedia/gnash/hacks.mk new file mode 100644 index 00000000000..aad9d8667ca --- /dev/null +++ b/multimedia/gnash/hacks.mk @@ -0,0 +1,18 @@ +# $NetBSD: hacks.mk,v 1.1 2007/02/15 14:29:54 joerg Exp $ + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "DragonFly" && ${PKGSRC_COMPILER} == "gcc" +# +# Workaround an ICE in the stack-smashing protection in GCC 3.4.x. +# +.if !defined(HAS_PROPOLICE) +HAS_PROPOLICE!= ( ${CC} -v 2>&1 | ${GREP} 'propolice' ) 2>/dev/null || echo no +MAKEVARS+= HAS_PROPOLICE +.endif + +.if ${HAS_PROPOLICE} != "no" +CFLAGS+= -fno-stack-protector +CXXFLAGS+= -fno-stack-protector +.endif +.endif |