summaryrefslogtreecommitdiff
path: root/wm/windowmaker
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2007-06-21 00:58:04 +0000
committerminskim <minskim@pkgsrc.org>2007-06-21 00:58:04 +0000
commit9d3bbf3d11882372f75dc50abac01fce565dbabf (patch)
tree644a4b2f115627637864f3b73e4ea91275b4b445 /wm/windowmaker
parentba3c04396d263d92f045e559f51743234468e557 (diff)
downloadpkgsrc-9d3bbf3d11882372f75dc50abac01fce565dbabf.tar.gz
If gcc-4 is used, disable inline assembly until GCC Bug #25221 is fixed.
Previously, it was done in Makefile for gcc-4.1 only. Now it covers gcc-4.0.* and is located in the proper place (hacks.mk). This fixes PR 36460.
Diffstat (limited to 'wm/windowmaker')
-rw-r--r--wm/windowmaker/Makefile4
-rw-r--r--wm/windowmaker/hacks.mk7
2 files changed, 9 insertions, 2 deletions
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 35deac19181..6acef36bfc8 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2007/02/03 02:59:22 joerg Exp $
+# $NetBSD: Makefile,v 1.75 2007/06/21 00:58:04 minskim Exp $
DISTNAME= WindowMaker-0.92.0
PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
@@ -30,7 +30,7 @@ INSTALL_TARGET= install-strip
.include "../../mk/compiler.mk"
-.if ${MACHINE_ARCH} != "i386" || !empty(CC_VERSION:Mgcc-4.1.*)
+.if ${MACHINE_ARCH} != "i386"
CONFIGURE_ENV+= ac_cv_c_inline_asm=no
.endif
diff --git a/wm/windowmaker/hacks.mk b/wm/windowmaker/hacks.mk
new file mode 100644
index 00000000000..a688966805d
--- /dev/null
+++ b/wm/windowmaker/hacks.mk
@@ -0,0 +1,7 @@
+# $NetBSD: hacks.mk,v 1.1 2007/06/21 00:58:04 minskim Exp $
+
+# Disable inline assembly on i386 until GCC Bug #25221 is fixed.
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25221
+.if !empty(CC_VERSION:Mgcc-4.*)
+CONFIGURE_ENV+= ac_cv_c_inline_asm=no
+.endif