From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79A2D138330 for ; Sun, 7 Jan 2018 05:36:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F62EE08BF; Sun, 7 Jan 2018 05:36:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6EB0AE08BF for ; Sun, 7 Jan 2018 05:36:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77638335D0D for ; Sun, 7 Jan 2018 05:36:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 01955147 for ; Sun, 7 Jan 2018 05:36:14 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1515303356.0e65ce99c0060112a39c50bb7f74454a9e577e4a.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-mk-defs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch X-VCS-Directories: sys-freebsd/freebsd-mk-defs/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 0e65ce99c0060112a39c50bb7f74454a9e577e4a X-VCS-Branch: master Date: Sun, 7 Jan 2018 05:36:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b5904867-15ec-4257-96f7-c7180691ac6c X-Archives-Hash: 01493b9ce7c3423b28f93071ddbbe4fc commit: 0e65ce99c0060112a39c50bb7f74454a9e577e4a Author: Michael Mair-Keimberger gmail com> AuthorDate: Wed Jan 3 17:04:37 2018 +0000 Commit: Alexis Ballier gentoo 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}