[patch] Patch to allow xorg-x11 to build with hardened gcc

xorg-x11-hardenedgcc.patch (text/plain), 1.34 KB, created by Kevin F. Quinn (RETIRED) on 2004-07-31 08:07:32 UTC

--- orig/xc/config/imake/imake.c	2004-07-31 15:55:49.000000000 +0200
+++ work/xc/config/imake/imake.c	2004-07-31 12:17:28.000000000 +0200
@@ -1047,7 +1047,12 @@
   if (fp == NULL) 
     abort();
   while (fgets(buf, sizeof(buf), fp)) {
-    if (strstr(buf, "propolice") != NULL) {
+    /* Modified to pick up Gentoo hardened gcc.  Not sure exactly
+       what "propolice" is looking for, whether it's a configure option
+       or the identification.  If the latter, the equivalent string
+       for gentoo may be "ssp" rather than "Hardened". */
+    if ((strstr(buf, "propolice") != NULL) ||
+        (strstr(buf, "Hardened") != NULL)) {
       fprintf(inFile, "#define HasGccStackProtector YES\n");
       break;
     }
--- orig/xc/config/cf/xf86.tmpl	2004-04-02 23:47:10.000000000 +0200
+++ work/xc/config/cf/xf86.tmpl	2004-07-31 14:43:19.000000000 +0200
@@ -50,7 +50,7 @@
 #endif
 
 #if HasGccStackProtector
-MODULE_GCC_FLAGS1 = -fno-stack-protector
+MODULE_GCC_FLAGS1 = -fno-stack-protector -fno-pie
 #endif 
 
 #ifndef HasGccMergeConstants
--- orig/xc/config/cf/xorg.tmpl	2004-04-02 23:47:10.000000000 +0200
+++ work/xc/config/cf/xorg.tmpl	2004-07-31 14:43:17.000000000 +0200
@@ -64,7 +64,7 @@
 #endif
 
 #if HasGccStackProtector
-MODULE_GCC_FLAGS1 = -fno-stack-protector
+MODULE_GCC_FLAGS1 = -fno-stack-protector -fno-pie
 #endif 
 
 #ifndef HasGccMergeConstants