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 DE35D1382C5 for ; Tue, 23 Jan 2018 14:14:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6357E0A43; Tue, 23 Jan 2018 14:14:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B0DE8E0A43 for ; Tue, 23 Jan 2018 14:14:46 +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 CBA23335C2E for ; Tue, 23 Jan 2018 14:14:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7EAEC1BD for ; Tue, 23 Jan 2018 14:14:40 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1516716847.3ce477eb8cf12d1f140721cd4454a23c05c8da0c.mgorny@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: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3ce477eb8cf12d1f140721cd4454a23c05c8da0c X-VCS-Branch: master Date: Tue, 23 Jan 2018 14:14:40 +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: 2020f612-48e1-45a9-aa28-d8437504ab92 X-Archives-Hash: 5a7a3b9e43c6d9b6da3c1685a76c9d13 commit: 3ce477eb8cf12d1f140721cd4454a23c05c8da0c Author: Michał Górny gentoo org> AuthorDate: Tue Jan 23 14:14:07 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jan 23 14:14:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ce477eb sys-freebsd/freebsd-mk-defs: Revert "remove unused patch" Restore the patch needed for restored 9.1. .../files/freebsd-mk-defs-add-nossp-cflags.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) 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 new file mode 100644 index 00000000000..8eb80c38cc7 --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch @@ -0,0 +1,28 @@ +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}