Module Name: src
Committed By: riz
Date: Fri Oct 18 01:12:00 UTC 2013
Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.libx11
src/external/mit/xorg/lib/libXi: Makefile
Log Message:
Before testing the value of HAVE_GCC, test if it's defined.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/libX11/Makefile.libx11
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libXi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.11 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.12
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.11 Mon Jun 3 23:01:12 2013
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Fri Oct 18 01:12:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.11 2013/06/03 23:01:12 christos Exp $
+# $NetBSD: Makefile.libx11,v 1.12 2013/10/18 01:12:00 riz Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -462,7 +462,7 @@ COPTS.Font.c+= -Wno-error # XXX xf86big
COPTS.OpenDis.c+= -Wno-error # XXX xf86bigfstr.h
COPTS.XlibInt.c+= -Wno-error # XXX xcmiscstr.h
COPTS.XKBBind.c+= -Wno-error # uses XKeycodeToKeysym
-.if ${HAVE_GCC} < 45
+.if defined(HAVE_GCC) && ${HAVE_GCC} < 45
COPTS.LiHosts.c+= -Wno-error # XXX: old gcc figures out that const
# cond because nHosts < max_hosts
.endif
Index: src/external/mit/xorg/lib/libXi/Makefile
diff -u src/external/mit/xorg/lib/libXi/Makefile:1.10 src/external/mit/xorg/lib/libXi/Makefile:1.11
--- src/external/mit/xorg/lib/libXi/Makefile:1.10 Thu Jun 6 21:42:36 2013
+++ src/external/mit/xorg/lib/libXi/Makefile Fri Oct 18 01:12:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/06/06 21:42:36 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2013/10/18 01:12:00 riz Exp $
.include <bsd.own.mk>
@@ -80,7 +80,7 @@ PKGDIST= ${LIB}
COPTS.XExtInt.c+= -Wno-error # XXX
COPTS.XSndExEv.c+= -Wno-error # XXX
-.if ${HAVE_GCC} < 45
+.if defined(HAVE_GCC) && ${HAVE_GCC} < 45
COPTS.XGetFCtl.c+= -Wno-error # XXX
.endif
