summaryrefslogtreecommitdiff
path: root/x11/XFree86-4-libraries
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2003-10-12 23:12:43 +0000
committerEric Anholt <anholt@FreeBSD.org>2003-10-12 23:12:43 +0000
commitb0c17c5aef0121205df7d6a7c5c88c172832956d (patch)
treec69774a9613882dc640886ad02ceca9ef297bf52 /x11/XFree86-4-libraries
parentCorrect some small spacing nits, and add a note about tracking (diff)
Suppress warnings in system headers with gcc 3.x.
Notes
Notes: svn path=/head/; revision=90958
Diffstat (limited to 'x11/XFree86-4-libraries')
-rw-r--r--x11/XFree86-4-libraries/files/patch-FreeBSD.cf17
1 files changed, 11 insertions, 6 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-FreeBSD.cf b/x11/XFree86-4-libraries/files/patch-FreeBSD.cf
index a91c704728dd..2f48f7e264f8 100644
--- a/x11/XFree86-4-libraries/files/patch-FreeBSD.cf
+++ b/x11/XFree86-4-libraries/files/patch-FreeBSD.cf
@@ -1,5 +1,5 @@
--- config/cf/FreeBSD.cf.orig Tue Jan 14 18:52:12 2003
-+++ config/cf/FreeBSD.cf Fri Aug 22 20:02:11 2003
++++ config/cf/FreeBSD.cf Sun Oct 12 15:32:56 2003
@@ -162,11 +162,11 @@
* ld: warning: libXThrStub.so.6, needed by libX11.so, not found
*/
@@ -16,16 +16,21 @@
#endif
#define CppCmd /usr/bin/cpp
-@@ -177,7 +177,7 @@
+@@ -177,7 +177,12 @@
#if defined(UseInstalled)
#define DefaultCCOptions /**/
#else
-#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions
-+#define DefaultCCOptions -ansi -Dasm=__asm GccWarningOptions
++#if defined(HasGcc3) && HasGcc3
++#define NoSystemWarn -Wno-system-headers
++#else
++#define NoSystemWarn
++#endif
++#define DefaultCCOptions -ansi-Dasm=__asm NoSystemWarn GccWarningOptions
#endif
#endif
#ifndef ExtraLibraries
-@@ -228,21 +228,25 @@
+@@ -228,21 +233,25 @@
#endif
/*
@@ -54,7 +59,7 @@
# define HasX86Support YES
# define HasMMXSupport YES
# define Has3DNowSupport YES
-@@ -455,10 +459,8 @@
+@@ -455,10 +464,8 @@
#ifdef i386Architecture
#define ServerExtraDefines GccGasOption XFree86ServerDefines
#endif
@@ -67,7 +72,7 @@
#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
#endif
-@@ -482,18 +484,8 @@
+@@ -482,18 +489,8 @@
#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
#endif