From patchwork Fri Jan 11 10:01:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1023478 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MEKG0CQY"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43bdgB4fvcz9sLw for ; Fri, 11 Jan 2019 21:01:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 15FA387C20; Fri, 11 Jan 2019 10:01:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wmT65Zt+iipz; Fri, 11 Jan 2019 10:01:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 934CE87C0D; Fri, 11 Jan 2019 10:01:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id F305C1C1135 for ; Fri, 11 Jan 2019 10:01:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id F078E85D4C for ; Fri, 11 Jan 2019 10:01:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4fslBO9MtQr7 for ; Fri, 11 Jan 2019 10:01:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 95623858F5 for ; Fri, 11 Jan 2019 10:01:16 +0000 (UTC) Received: by mail-ed1-f44.google.com with SMTP id f9so12569927eds.10 for ; Fri, 11 Jan 2019 02:01:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OO12pxL+Ol34wPPk9oTUSEuiuksYDfFcEMTUMd6pLNw=; b=MEKG0CQY97Jcmmsu1A7powoo1zWHtXKolX4ujGXgHgirLpSobCPZ872UnwLb5reuTE Zj7Z6z7UztBdXrDtqfpzc9a87xYUmgUEDLqs3/BjYSQ6fRH5v2s44WqKCGjeD4CNFaog cC6w8ZuMwgOVgT0hERDyWtnaeA3QMUnr5dzE6bnMNWxMTutktzQjuWVWFg/wQRd2HE5+ hFhzFuxPUrUIuZFtmmpQu/G87dSUI5lXroIIGytfNIgshvAE5j8HTyvKg/R/5srfEH4r n3rD8LkKQJbvK1g2Ei7dhpPT6kUYvPBdaMwHTrFZGZLO4dNoqRuICeROjtvXHEjVWfl5 0smw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=OO12pxL+Ol34wPPk9oTUSEuiuksYDfFcEMTUMd6pLNw=; b=il+MDtSA4psoZxZNnOHtPZ0wnpoH07JDq3b3WFIQr6Xv4UUb2A9dCTsK82B8uWO+bw az0E4P6qHMPYVVKBrgfXt45FYe1HeiaFMGJWQTk+plnktc9leb/ZCorrWhBS1AutAUF2 XfKqvqx3kkdxtol9TsGbQpY18uBvV7reO0i4PrIpbrYY+4dPm/N3nNfbPppqHhvpzOsC 8Cyah66dkfQHl9WVocfLvRYPUtwfSpq8nPFQWofXcQJ36tHhTPKP/I/E/6rizqnYvPkH rkpdl+MXGipesg/zvhOHNfAGYfslGnEHLEO/izKZXyKcDmnO3MqrrYaJm2i5uSXS2wAH KTWQ== X-Gm-Message-State: AJcUukeehON+uq62FV2C/5FnMuvBz7byIKG6DL+C0D2D59nHLKxQmpDO 8FTV6XjHq03logatcXDsTM+o880a X-Google-Smtp-Source: ALg8bN5p0/Z/k7qoQ+sQJOr+sTvQt89eeAcpUD8f5gsK/gemgzcnhNDf0KzkKPqajnztsuaEgQ95sQ== X-Received: by 2002:a50:b7d6:: with SMTP id i22mr12413832ede.27.1547200874328; Fri, 11 Jan 2019 02:01:14 -0800 (PST) Received: from dell.be.48ers.dk (d51a5bc31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id 24-v6sm1225093ejx.68.2019.01.11.02.01.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Jan 2019 02:01:13 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.89) (envelope-from ) id 1ghtcm-0004gP-NP; Fri, 11 Jan 2019 11:01:12 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Fri, 11 Jan 2019 11:01:09 +0100 Message-Id: <20190111100111.17867-1-peter@korsgaard.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/3] package/gnu-efi: get rid of patch X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Pass TARGET_CONFIGURE_OPTS in the environment instead of on the make command line, so 'CFLAGS +=' does the right thing in the Makefile without patching. TARGET_CONFIGURE_OPTS includes TARGET_MAKE_ENV, so drop that. This does require us to pass CROSS_COMPILE to ensure the native tools are not used though. Add a GNU_EFI_MAKE_OPTS and use in both the build and install steps, instead of repeating the various arguments. Signed-off-by: Peter Korsgaard --- ...S-CPPFLAGS-to-be-completed-from-the-envir.patch | 103 --------------------- package/gnu-efi/gnu-efi.mk | 15 +-- 2 files changed, 8 insertions(+), 110 deletions(-) delete mode 100644 package/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch diff --git a/package/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch b/package/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch deleted file mode 100644 index 11507388ea..0000000000 --- a/package/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch +++ /dev/null @@ -1,103 +0,0 @@ -From eea0f62a1f6712f10afe47635b80a061505d2d2f Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 17 Jan 2015 18:33:37 +0100 -Subject: [PATCH 1/2] Allow CFLAGS/CPPFLAGS to be completed from the - environment - -Buildroot passes its own CPPFLAGS and CFLAGS in the environment, so -the CFLAGS += and CPPFLAGS += statements in gnu-efi Makefile have no -effect. Change these to override += so that they extend the -flags passed by Buildroot. - -[Romain: - - rebase on top of 3.0.1 release] -[Bernd: - - rebase on top of 3.0.5 release] -[Benoît: - - rebase on top of 3.0.6 release] - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Romain Naour -Signed-off-by: Bernd Kuhls -Signed-off-by: Benoît Allard ---- - Make.defaults | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/Make.defaults b/Make.defaults -index 51bd7d8..7d7e8e7 100755 ---- a/Make.defaults -+++ b/Make.defaults -@@ -85,14 +85,14 @@ OBJDIR := $(TOPDIR)/$(ARCH) - # - - # Arch-specific compilation flags --CPPFLAGS += -DCONFIG_$(ARCH) -+override CPPFLAGS += -DCONFIG_$(ARCH) - - ifeq ($(ARCH),ia64) -- CFLAGS += -mfixed-range=f32-f127 -+ override CFLAGS += -mfixed-range=f32-f127 - endif - - ifeq ($(ARCH),ia32) -- CFLAGS += -mno-mmx -mno-sse -+ override CFLAGS += -mno-mmx -mno-sse - ifeq ($(HOSTARCH),x86_64) - ARCH3264 = -m32 - endif -@@ -109,19 +109,19 @@ ifeq ($(ARCH),x86_64) - && [ $(GCCMINOR) -ge "7" ] ) ) \ - && echo 1) - ifeq ($(GCCNEWENOUGH),1) -- CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11 -+ override CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11 - else ifeq ($(USING_CLANG),clang) -- CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11 -+ override CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11 - endif - -- CFLAGS += -mno-red-zone -+ override CFLAGS += -mno-red-zone - ifeq ($(HOSTARCH),ia32) - ARCH3264 = -m64 - endif - endif - - ifeq ($(ARCH),mips64el) -- CFLAGS += -march=mips64r2 -+ override CFLAGS += -march=mips64r2 - ARCH3264 = -mabi=64 - endif - -@@ -142,7 +142,7 @@ export LIBGCC=$(shell $(CC) $(ARCH3264) - endif - - ifeq ($(ARCH),arm) --CFLAGS += -marm -+override CFLAGS += -marm - endif - - # Generic compilation flags -@@ -152,15 +152,15 @@ INCDIR += -I$(SRCDIR) -I$(TOPDIR)/inc - - # Only enable -fpic for non MinGW compilers (unneeded on MinGW) - GCCMACHINE := $(shell $(CC) -dumpmachine) - ifneq (mingw32,$(findstring mingw32, $(GCCMACHINE))) -- CFLAGS += -fpic -+ override CFLAGS += -fpic - endif - - ifeq (FreeBSD, $(findstring FreeBSD, $(OS))) --CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ -+override CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ - -fshort-wchar -fno-strict-aliasing \ - -ffreestanding -fno-stack-protector - else --CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ -+override CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \ - -fshort-wchar -fno-strict-aliasing \ - -fno-merge-all-constants -ffreestanding -fno-stack-protector \ - -fno-stack-check --- -2.11.0 - diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index d55e0274df..b83a5a9eb4 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -26,17 +26,18 @@ else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) GNU_EFI_PLATFORM = aarch64 endif +GNU_EFI_MAKE_OPTS = \ + ARCH=$(GNU_EFI_PLATFORM) \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + PREFIX=/usr + define GNU_EFI_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - $(TARGET_CONFIGURE_OPTS) \ - ARCH=$(GNU_EFI_PLATFORM) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(GNU_EFI_MAKE_OPTS) endef define GNU_EFI_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - $(TARGET_CONFIGURE_OPTS) \ - INSTALLROOT=$(STAGING_DIR) \ - PREFIX=/usr ARCH=$(GNU_EFI_PLATFORM) install + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(GNU_EFI_MAKE_OPTS) \ + INSTALLROOT=$(STAGING_DIR) install endef $(eval $(generic-package))