Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 36535 Details for
Bug 43177
(X) xfree-4.3.99.902-r2 and xorg-x11 startx fails with duplicate symbol in libbitmap.a
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Revised patch to build xorg-11 with hardened gcc using solar's suggested ssp & pie detection method
xorg-x11-hardenedgcc.patch (text/plain), 2.86 KB, created by
Kevin F. Quinn (RETIRED)
on 2004-07-31 14:10:05 UTC
(
hide
)
Description:
Revised patch to build xorg-11 with hardened gcc using solar's suggested ssp & pie detection method
Filename:
MIME Type:
Creator:
Kevin F. Quinn (RETIRED)
Created:
2004-07-31 14:10:05 UTC
Size:
2.86 KB
patch
obsolete
>diff -ur xorg-x11-6.7.0-r2.orig/xc/config/cf/xf86.tmpl xorg-x11-6.7.0-r2/xc/config/cf/xf86.tmpl >--- xorg-x11-6.7.0-r2.orig/xc/config/cf/xf86.tmpl 2004-07-31 22:21:33.000000000 +0200 >+++ xorg-x11-6.7.0-r2/xc/config/cf/xf86.tmpl 2004-07-31 22:50:56.473231288 +0200 >@@ -53,15 +53,23 @@ > MODULE_GCC_FLAGS1 = -fno-stack-protector > #endif > >+#ifndef HasGccPie >+#define HasGccPie NO >+#endif >+ >+#if HasGccPie >+MODULE_GCC_FLAGS2 = -fno-pie >+#endif >+ > #ifndef HasGccMergeConstants > #define HasGccMergeConstants NO > #endif > > #if HasGccMergeConstants && DoLoadableServer && !MakeDllModules >-MODULE_GCC_FLAGS2 = -fno-merge-constants >+MODULE_GCC_FLAGS3 = -fno-merge-constants > #endif > >-MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2) >+MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2) $(MODULE_GCC_FLAGS3) > > #if defined(IHaveModules) && MakeDllModules > MODULE_PIC_FLAGS = $(PICFLAGS) >diff -ur xorg-x11-6.7.0-r2.orig/xc/config/cf/xorg.tmpl xorg-x11-6.7.0-r2/xc/config/cf/xorg.tmpl >--- xorg-x11-6.7.0-r2.orig/xc/config/cf/xorg.tmpl 2004-07-31 22:21:33.000000000 +0200 >+++ xorg-x11-6.7.0-r2/xc/config/cf/xorg.tmpl 2004-07-31 22:50:10.278253992 +0200 >@@ -67,15 +67,23 @@ > MODULE_GCC_FLAGS1 = -fno-stack-protector > #endif > >+#ifndef HasGccPie >+#define HasGccPie NO >+#endif >+ >+#if HasGccPie >+MODULE_GCC_FLAGS2 = -fno-pie >+#endif >+ > #ifndef HasGccMergeConstants > #define HasGccMergeConstants NO > #endif > > #if HasGccMergeConstants && DoLoadableServer && !MakeDllModules >-MODULE_GCC_FLAGS2 = -fno-merge-constants >+MODULE_GCC_FLAGS3 = -fno-merge-constants > #endif > >-MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2) >+MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2) $(MODULE_GCC_FLAGS3) > > #if defined(IHaveModules) && MakeDllModules > MODULE_PIC_FLAGS = $(PICFLAGS) >diff -ur xorg-x11-6.7.0-r2.orig/xc/config/imake/imake.c xorg-x11-6.7.0-r2/xc/config/imake/imake.c >--- xorg-x11-6.7.0-r2.orig/xc/config/imake/imake.c 2004-07-31 22:21:33.000000000 +0200 >+++ xorg-x11-6.7.0-r2/xc/config/imake/imake.c 2004-07-31 22:45:59.024450376 +0200 >@@ -1034,26 +1034,19 @@ > static void > get_stackprotector(FILE *inFile) > { >- FILE *fp; > char *cc; >- char command[1024], buf[1024]; >+ char command[1024]; > > cc = getenv("CC"); > if (cc == NULL) { > cc = "cc"; > } >- snprintf(command, sizeof(command), "%s -v 2>&1", cc); >- fp = popen(command, "r"); >- if (fp == NULL) >- abort(); >- while (fgets(buf, sizeof(buf), fp)) { >- if (strstr(buf, "propolice") != NULL) { >+ snprintf(command, sizeof(command), "%s -fno-stack-protector -S -o /dev/null -xc /dev/null 2>&1", cc); >+ if (system(command)==0) > fprintf(inFile, "#define HasGccStackProtector YES\n"); >- break; >- } >- } >- if (pclose(fp)) >- abort(); >+ snprintf(command, sizeof(command), "%s -fno-pie -S -o /dev/null -xc /dev/null 2>&1", cc); >+ if (system(command)==0) >+ fprintf(inFile, "#define HasGccPie YES\n"); > } > >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 43177
:
29146
|
29147
|
33502
|
33503
|
36524
|
36535
|
36801
|
38599
|
39737
|
39853
|
40178
|
40179
|
40195
|
44813
|
44827
|
46869