pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/wm/windowmaker If gcc-4 is used, disable inline assemb...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/42f8fcbddd2a
branches:  trunk
changeset: 530276:42f8fcbddd2a
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Thu Jun 21 00:58:04 2007 +0000

description:
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:

 wm/windowmaker/Makefile |  4 ++--
 wm/windowmaker/hacks.mk |  7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r f337fe06edbc -r 42f8fcbddd2a wm/windowmaker/Makefile
--- a/wm/windowmaker/Makefile   Thu Jun 21 00:00:23 2007 +0000
+++ b/wm/windowmaker/Makefile   Thu Jun 21 00:58:04 2007 +0000
@@ -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 @@
 
 .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 -r f337fe06edbc -r 42f8fcbddd2a wm/windowmaker/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/windowmaker/hacks.mk   Thu Jun 21 00:58:04 2007 +0000
@@ -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



Home | Main Index | Thread Index | Old Index