From patchwork Sun Jul 2 16:53:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 783209 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x0xF24msHz9s65 for ; Mon, 3 Jul 2017 02:54:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 304BF2A16A; Sun, 2 Jul 2017 16:54:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fjUOUEjMZjCN; Sun, 2 Jul 2017 16:54:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 736502D2F3; Sun, 2 Jul 2017 16:54:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E0C4C1C2192 for ; Sun, 2 Jul 2017 16:54:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DAFA58730A for ; Sun, 2 Jul 2017 16:54:00 +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 2MV5UErsvk0Q for ; Sun, 2 Jul 2017 16:53:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by hemlock.osuosl.org (Postfix) with ESMTP id 121DD87302 for ; Sun, 2 Jul 2017 16:53:58 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 84CC121E43; Sun, 2 Jul 2017 18:53:56 +0200 (CEST) Received: from localhost (ARennes-651-1-1-150.w86-215.abo.wanadoo.fr [86.215.144.150]) by mail.free-electrons.com (Postfix) with ESMTPSA id 2FE7E21E04; Sun, 2 Jul 2017 18:53:46 +0200 (CEST) From: Thomas Petazzoni To: buildroot@buildroot.org Date: Sun, 2 Jul 2017 18:53:24 +0200 Message-Id: <20170702165342.29522-3-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170702165342.29522-1-thomas.petazzoni@free-electrons.com> References: <20170702165342.29522-1-thomas.petazzoni@free-electrons.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH 02/20] efibootmgr: don't download patch from Github X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Patches downloaded from Github are not stable, so bring them in the tree. Signed-off-by: Thomas Petazzoni --- .../0001-dont-use-fshort-wchar-when-building.patch | 28 ++++++++++++++++++++++ ...bc.patch => 0002-Allow-build-with-uClibc.patch} | 0 package/efibootmgr/efibootmgr.hash | 1 - package/efibootmgr/efibootmgr.mk | 3 --- 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 package/efibootmgr/0001-dont-use-fshort-wchar-when-building.patch rename package/efibootmgr/{0001-Allow-build-with-uClibc.patch => 0002-Allow-build-with-uClibc.patch} (100%) diff --git a/package/efibootmgr/0001-dont-use-fshort-wchar-when-building.patch b/package/efibootmgr/0001-dont-use-fshort-wchar-when-building.patch new file mode 100644 index 0000000..abafcec --- /dev/null +++ b/package/efibootmgr/0001-dont-use-fshort-wchar-when-building.patch @@ -0,0 +1,28 @@ +From 3466fd05c8c6f1052e0426d64eed40f8a88fd78f Mon Sep 17 00:00:00 2001 +From: steve-mcintyre +Date: Fri, 6 Jan 2017 18:18:47 +0000 +Subject: [PATCH] Don't use -fshort-wchar when building (#63) + +It's not needed and is causing build failures with gcc 6. Closes +Debian bug #849651 + +Signed-off-by: Steve McIntyre +[Upstream commit: https://github.com/rhinstaller/efibootmgr/commit/3466fd05c8c6f1052e0426d64eed40f8a88fd78f] +Signed-off-by: Thomas Petazzoni +--- + Make.defaults | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Make.defaults b/Make.defaults +index 50f1f4d..0ac50ef 100644 +--- a/Make.defaults ++++ b/Make.defaults +@@ -26,7 +26,7 @@ clang_cflags = + gcc_cflags = + cflags = $(CFLAGS) $(SUBDIR_CFLAGS) \ + -Werror -Wall -Wextra -Wsign-compare -Wstrict-aliasing \ +- -std=gnu11 -fshort-wchar -fPIC \ ++ -std=gnu11 -fPIC \ + -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" \ + -DEFIBOOTMGR_VERSION="\"$(VERSION)\"" \ + $(if $(findstring clang,$(CC)),$(clang_cflags),) \ diff --git a/package/efibootmgr/0001-Allow-build-with-uClibc.patch b/package/efibootmgr/0002-Allow-build-with-uClibc.patch similarity index 100% rename from package/efibootmgr/0001-Allow-build-with-uClibc.patch rename to package/efibootmgr/0002-Allow-build-with-uClibc.patch diff --git a/package/efibootmgr/efibootmgr.hash b/package/efibootmgr/efibootmgr.hash index 3f934ba..f71dced 100644 --- a/package/efibootmgr/efibootmgr.hash +++ b/package/efibootmgr/efibootmgr.hash @@ -1,3 +1,2 @@ # locally computed hash sha256 3f260491e2c62e93cb6347ea6f21aaa5f93152e9e7f0269d314623769d82e473 efibootmgr-14.tar.gz -sha256 8e91f16927d296ffebd4f7fafda2f84c0f6201aba089a35e8090abd5aacdc58e 3466fd05c8c6f1052e0426d64eed40f8a88fd78f.patch diff --git a/package/efibootmgr/efibootmgr.mk b/package/efibootmgr/efibootmgr.mk index a946d5f..094dd28 100644 --- a/package/efibootmgr/efibootmgr.mk +++ b/package/efibootmgr/efibootmgr.mk @@ -6,9 +6,6 @@ EFIBOOTMGR_VERSION = 14 EFIBOOTMGR_SITE = $(call github,rhinstaller,efibootmgr,$(EFIBOOTMGR_VERSION)) -# Patch fixes the build with gcc 6.x. -EFIBOOTMGR_PATCH = \ - https://github.com/rhinstaller/efibootmgr/commit/3466fd05c8c6f1052e0426d64eed40f8a88fd78f.patch EFIBOOTMGR_LICENSE = GPL-2.0+ EFIBOOTMGR_LICENSE_FILES = COPYING EFIBOOTMGR_DEPENDENCIES = efivar $(if $(BR2_NEEDS_GETTEXT),gettext)