pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/wm/windowmaker Disable inline assembler if GCC 4.1.x i...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d80ff537f1a5
branches:  trunk
changeset: 515248:d80ff537f1a5
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Jun 29 16:23:08 2006 +0000

description:
Disable inline assembler if GCC 4.1.x is used to fix build problems.

diffstat:

 wm/windowmaker/Makefile |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (29 lines):

diff -r f64d4a2dc14d -r d80ff537f1a5 wm/windowmaker/Makefile
--- a/wm/windowmaker/Makefile   Thu Jun 29 14:01:58 2006 +0000
+++ b/wm/windowmaker/Makefile   Thu Jun 29 16:23:08 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2006/05/30 19:49:25 reed Exp $
+# $NetBSD: Makefile,v 1.70 2006/06/29 16:23:08 tron Exp $
 
 DISTNAME=      WindowMaker-0.92.0
 PKGNAME=       ${DISTNAME:S/WindowMaker/windowmaker/}
@@ -25,14 +25,14 @@
 CONFIGURE_ARGS+=       --with-nlsdir=${PREFIX:Q}/${PKGLOCALEDIR:Q}/locale
 CONFIGURE_ENV+=                LINGUAS=yes
 CONFIGURE_ENV+=                CPP_PATH=${CPP:Q}
-.if ${MACHINE_ARCH} != "i386"
-CONFIGURE_ENV+=                ac_cv_c_inline_asm=no
-.endif
-
 REPLACE_PERL+=         util/wkdemenu.pl
 INSTALL_TARGET=                install-strip
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
+
+.if ${MACHINE_ARCH} != "i386" || !empty(CC_VERSION:Mgcc-4.1.*)
+CONFIGURE_ENV+=                ac_cv_c_inline_asm=no
+.endif
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=     3.0



Home | Main Index | Thread Index | Old Index