Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -0,0 +1,28 @@
|
||||
From 3466fd05c8c6f1052e0426d64eed40f8a88fd78f Mon Sep 17 00:00:00 2001
|
||||
From: steve-mcintyre <steve-github@einval.com>
|
||||
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 <steve@einval.com>
|
||||
[Upstream commit: https://github.com/rhinstaller/efibootmgr/commit/3466fd05c8c6f1052e0426d64eed40f8a88fd78f]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
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),) \
|
||||
@@ -6,22 +6,19 @@ config BR2_PACKAGE_EFIBOOTMGR
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # efivar
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
|
||||
depends on BR2_USE_WCHAR # gettext
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
|
||||
select BR2_PACKAGE_EFIVAR
|
||||
help
|
||||
A Linux user-space application to modify the Intel Extensible
|
||||
Firmware Interface (EFI) Boot Manager. This application can create
|
||||
and destroy boot entries, change the boot order, change the next
|
||||
running boot option, and more.
|
||||
Firmware Interface (EFI) Boot Manager. This application can
|
||||
create and destroy boot entries, change the boot order, change
|
||||
the next running boot option, and more.
|
||||
|
||||
https://github.com/rhinstaller/efibootmgr
|
||||
|
||||
comment "efibootmgr needs a glibc or uClibc toolchain w/ wchar, dynamic library, headers >= 3.12, gcc >= 4.9"
|
||||
comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9"
|
||||
depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS
|
||||
depends on BR2_STATIC_LIBS || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
|
||||
BR2_TOOLCHAIN_USES_MUSL || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
|
||||
!BR2_USE_WCHAR
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
# locally computed hash
|
||||
sha256 3f260491e2c62e93cb6347ea6f21aaa5f93152e9e7f0269d314623769d82e473 efibootmgr-14.tar.gz
|
||||
sha256 8e91f16927d296ffebd4f7fafda2f84c0f6201aba089a35e8090abd5aacdc58e 3466fd05c8c6f1052e0426d64eed40f8a88fd78f.patch
|
||||
|
||||
@@ -6,13 +6,10 @@
|
||||
|
||||
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 = GPLv2+
|
||||
EFIBOOTMGR_LICENSE = GPL-2.0+
|
||||
EFIBOOTMGR_LICENSE_FILES = COPYING
|
||||
EFIBOOTMGR_DEPENDENCIES = efivar $(if $(BR2_NEEDS_GETTEXT),gettext)
|
||||
EFIBOOTMGR_LDFLAGS = $(TARGET_LDFLAGS) $(if $(BR2_NEEDS_GETTEXT),-lintl)
|
||||
EFIBOOTMGR_DEPENDENCIES = efivar $(TARGET_NLS_DEPENDENCIES)
|
||||
EFIBOOTMGR_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
|
||||
|
||||
define EFIBOOTMSR_PATCH_HEADER_PATH
|
||||
$(SED) 's,-I/,-I$(STAGING_DIR)/,' $(@D)/Makefile
|
||||
@@ -21,12 +18,12 @@ endef
|
||||
EFIBOOTMGR_POST_PATCH_HOOKS += EFIBOOTMSR_PATCH_HEADER_PATH
|
||||
|
||||
define EFIBOOTMGR_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
|
||||
LDFLAGS="$(EFIBOOTMGR_LDFLAGS)" $(MAKE1) -C $(@D)
|
||||
endef
|
||||
|
||||
define EFIBOOTMGR_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
|
||||
DESTDIR=$(TARGET_DIR) install
|
||||
endef
|
||||
|
||||
|
||||
Reference in New Issue
Block a user