From 6a12dd1538c74616aedd900e7812137dde22a59e Mon Sep 17 00:00:00 2001
From: minskim <minskim@pkgsrc.org>
Date: Thu, 21 Jun 2007 00:58:04 +0000
Subject: 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.
---
 wm/windowmaker/Makefile | 4 ++--
 wm/windowmaker/hacks.mk | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 wm/windowmaker/hacks.mk

(limited to 'wm')

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
-- 
cgit v1.2.3