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 @@ +popt: Disable default stack protection on internal version of popt + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: rpm-5.4.15/popt/configure.ac +=================================================================== +--- rpm-5.4.15.orig/popt/configure.ac ++++ rpm-5.4.15/popt/configure.ac +@@ -123,7 +123,6 @@ AS_IF([test "x$popt_gcc_warnings" = xyes + popt_CFLAGS_ADD([-Wjump-misses-init],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-Wno-format-nonliteral],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-Wframe-larger-than=$MAX_STACK_SIZE],[POPT_CFLAGS]) +- popt_CFLAGS_ADD([-fstack-protector-all],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-fasynchronous-unwind-tables],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-fdiagnostics-show-option],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-funit-at-a-time],[POPT_CFLAGS]) +@@ -203,7 +202,7 @@ AC_SUBST([POPT_LDFLAGS]) + # -fno-delete-null-pointer as the kernel does http://patchwork.kernel.org/patch/36060/ + # GNU GCC (usually "gcc") + AS_IF([test "x$GCC" != x], +- [ for c in -fno-delete-null-pointer-checks -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions ++ [ for c in -fno-delete-null-pointer-checks -fexceptions + do + popt_CFLAGS_ADD([$c], [POPT_CFLAGS]) + done |