| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | Make security switches manual settings |
| 2 | |
| 3 | RPM checks for the availability of the stack protector switch and |
| 4 | transactional-memory support. If supported it unconditionally |
| 5 | enables the compiler options which can cause errors if the support has |
| 6 | not been built into the compiler. |
| 7 | |
| 8 | Upstream-Status: Inappropriate [configuration] |
| 9 | |
| 10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 11 | |
| 12 | Index: rpm-5.4.15/configure.ac |
| 13 | =================================================================== |
| 14 | --- rpm-5.4.15.orig/configure.ac |
| 15 | +++ rpm-5.4.15/configure.ac |
| 16 | @@ -425,7 +425,7 @@ dnl # rpm_CFLAGS_ADD([-fstack-arrays],[ |
| 17 | dnl # build RPM instrumented for extra optimization/security (GCC only) |
| 18 | dnl # --- other optimizations |
| 19 | rpm_CFLAGS_ADD([-fexceptions], [RPM_CFLAGS]) |
| 20 | - rpm_CFLAGS_ADD([-D_FORTIFY_SOURCE=2 -fstack-protector], [RPM_CFLAGS]) |
| 21 | +dnl rpm_CFLAGS_ADD([-D_FORTIFY_SOURCE=2 -fstack-protector], [RPM_CFLAGS]) |
| 22 | dnl # rpm_CFLAGS_ADD([-fstack-protector-all],[RPM_CFLAGS]) |
| 23 | |
| 24 | if test \( ".`$CC --version 2>&1 | grep 'GCC'`" != . \); then |