aboutsummaryrefslogtreecommitdiffstats
path: root/x11-servers/xorg-server
diff options
context:
space:
mode:
authorlesi <lesi@FreeBSD.org>2007-06-22 01:33:47 +0800
committerlesi <lesi@FreeBSD.org>2007-06-22 01:33:47 +0800
commit37125efcf0c6e10bd59dcef4bb27526ae21bf0b3 (patch)
treed748e1bdd5555092483790953c40086def63c2ca /x11-servers/xorg-server
parent9e9b4a2f9cf7e146ac9947c661e3c75f9a7c557a (diff)
downloadfreebsd-ports-gnome-37125efcf0c6e10bd59dcef4bb27526ae21bf0b3.tar.gz
freebsd-ports-gnome-37125efcf0c6e10bd59dcef4bb27526ae21bf0b3.tar.zst
freebsd-ports-gnome-37125efcf0c6e10bd59dcef4bb27526ae21bf0b3.zip
Band-aid over memory hungry gcc 4.2 when compiling xf86ScanPci.c.
Submitted by: Michiel Boland ( michiel at boland dot org )
Diffstat (limited to 'x11-servers/xorg-server')
-rw-r--r--x11-servers/xorg-server/Makefile4
-rw-r--r--x11-servers/xorg-server/files/extra-patch-gcc4211
2 files changed, 15 insertions, 0 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index ed0461620aa5..cb2ba615090e 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -89,6 +89,10 @@ MAN1+= scanpci.1
PLIST_SUB+= AMD64_I386="@comment "
.endif
+.if ${OSVERSION} > 700042
+EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gcc42
+.endif
+
.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
pre-everything::
@${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by"
diff --git a/x11-servers/xorg-server/files/extra-patch-gcc42 b/x11-servers/xorg-server/files/extra-patch-gcc42
new file mode 100644
index 000000000000..4bf5a81558a4
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-patch-gcc42
@@ -0,0 +1,11 @@
+--- hw/xfree86/scanpci/Makefile.in.orig Wed Jun 20 12:50:37 2007
++++ hw/xfree86/scanpci/Makefile.in Wed Jun 20 12:50:57 2007
+@@ -132,7 +132,7 @@
+ CCDEPMODE = @CCDEPMODE@
+ CFB_FALSE = @CFB_FALSE@
+ CFB_TRUE = @CFB_TRUE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -O0
+ COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
+ COMPOSITE_FALSE = @COMPOSITE_FALSE@
+ COMPOSITE_TRUE = @COMPOSITE_TRUE@