From patchwork Tue Jun 9 10:14:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Neukirchen X-Patchwork-Id: 482167 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 781A8140345 for ; Tue, 9 Jun 2015 20:14:36 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 9942328BC22; Tue, 9 Jun 2015 12:12:37 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id E8DAF2807D8 for ; Tue, 9 Jun 2015 12:12:32 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from mout.web.de (mout.web.de [212.227.17.11]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 9 Jun 2015 12:12:32 +0200 (CEST) Received: from tenchi-htpc.lan ([91.66.247.224]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0LetQh-1ZOtJ73Oxj-00qkyO; Tue, 09 Jun 2015 12:14:10 +0200 From: Dirk Neukirchen To: openwrt-devel@lists.openwrt.org Date: Tue, 9 Jun 2015 12:14:31 +0200 Message-Id: <1433844871-3732-1-git-send-email-dirkneukirchen@web.de> X-Mailer: git-send-email 2.4.2 X-Provags-ID: V03:K0:be5dAtV24wdDJDgQ+HkQv4XShbaQakn59tPOpYRU+xSq2X+6ehu 5lyi2/clcsqaAutrD8OPA0d3lGZ4q57WTHJ63RnpGd25rjJY2ZDNsdbizkmDmLWYjZzMgKk MqbJ8c1O6riEu97GLlTaEieUrcRuZTLkyam1pxo7cJ+Jt5E7Qb+zuSMsLueL33biGM9dLp0 1/fM2Cf3/DVU3W12LVdXA== X-UI-Out-Filterresults: notjunk:1; Subject: [OpenWrt-Devel] [PATCH] grub2: disable stack-protector X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" - enabling "-fstack-protector" results in build errors - Upstream explicitly tests & disables it reference: upstream commit baa2a121e004a95a12e2bb7f2419de6625a30c2d Signed-off-by: Dirk Neukirchen --- package/boot/grub2/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/boot/grub2/Makefile b/package/boot/grub2/Makefile index 64a3058..ca59a87 100644 --- a/package/boot/grub2/Makefile +++ b/package/boot/grub2/Makefile @@ -43,6 +43,10 @@ define Package/grub2-editenv/description Edit grub2 environment files. endef +ifeq ($(strip $(PKG_CC_STACKPROTECTOR_REGULAR)),1) + TARGET_CFLAGS := $(filter-out -fstack-protector,$(TARGET_CFLAGS)) +endif + CONFIGURE_ARGS += \ --target=$(REAL_GNU_TARGET_NAME) \ --disable-werror \