diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch b/meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch new file mode 100644 index 0000000000..bcad8dcb73 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | popt: Disable default stack protection on internal version of popt | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
6 | |||
7 | Index: rpm-5.4.15/popt/configure.ac | ||
8 | =================================================================== | ||
9 | --- rpm-5.4.15.orig/popt/configure.ac | ||
10 | +++ rpm-5.4.15/popt/configure.ac | ||
11 | @@ -123,7 +123,6 @@ AS_IF([test "x$popt_gcc_warnings" = xyes | ||
12 | popt_CFLAGS_ADD([-Wjump-misses-init],[POPT_CFLAGS]) | ||
13 | popt_CFLAGS_ADD([-Wno-format-nonliteral],[POPT_CFLAGS]) | ||
14 | popt_CFLAGS_ADD([-Wframe-larger-than=$MAX_STACK_SIZE],[POPT_CFLAGS]) | ||
15 | - popt_CFLAGS_ADD([-fstack-protector-all],[POPT_CFLAGS]) | ||
16 | popt_CFLAGS_ADD([-fasynchronous-unwind-tables],[POPT_CFLAGS]) | ||
17 | popt_CFLAGS_ADD([-fdiagnostics-show-option],[POPT_CFLAGS]) | ||
18 | popt_CFLAGS_ADD([-funit-at-a-time],[POPT_CFLAGS]) | ||
19 | @@ -203,7 +202,7 @@ AC_SUBST([POPT_LDFLAGS]) | ||
20 | # -fno-delete-null-pointer as the kernel does http://patchwork.kernel.org/patch/36060/ | ||
21 | # GNU GCC (usually "gcc") | ||
22 | AS_IF([test "x$GCC" != x], | ||
23 | - [ for c in -fno-delete-null-pointer-checks -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions | ||
24 | + [ for c in -fno-delete-null-pointer-checks -fexceptions | ||
25 | do | ||
26 | popt_CFLAGS_ADD([$c], [POPT_CFLAGS]) | ||
27 | done | ||