commit: 0e65ce99c0060112a39c50bb7f74454a9e577e4a Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Wed Jan 3 17:04:37 2018 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Sun Jan 7 05:35:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e65ce99
sys-freebsd/freebsd-mk-defs: remove unused patch .../files/freebsd-mk-defs-add-nossp-cflags.patch | 28 ---------------------- 1 file changed, 28 deletions(-) diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch deleted file mode 100644 index 8eb80c38cc7..00000000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=511698 - -diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk -index e438633..de4a05b 100644 ---- a/share/mk/bsd.sys.mk -+++ b/share/mk/bsd.sys.mk -@@ -111,12 +111,18 @@ CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\ - CFLAGS+= -Qunused-arguments - .endif # CLANG - --.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \ -- ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" -+.if ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" \ -+ && ${MACHINE_CPUARCH} != "mips" -+.if ${MK_SSP} != "no" - # Don't use -Wstack-protector as it breaks world with -Werror. - SSP_CFLAGS?= -fstack-protector -+.else -+# gcc-4.9, -fstack-protector-strong is enabled by default. -+# Add -fno-stack-protector to disable it. Gentoo Bug #511698. -+SSP_CFLAGS= -fno-stack-protector -+.endif #SSP - CFLAGS+= ${SSP_CFLAGS} --.endif # SSP && !IA64 && !ARM && !MIPS -+.endif # !IA64 && !ARM && !MIPS - - # Allow user-specified additional warning flags - CFLAGS+= ${CWARNFLAGS}
