Bump buildroot to 2019.02
This commit is contained in:
@@ -1,103 +0,0 @@
|
||||
From eea0f62a1f6712f10afe47635b80a061505d2d2f Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@openwide.fr>
|
||||
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 <VARIABLE> += 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 <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Signed-off-by: Benoît Allard <benoit.allard@greenbone.net>
|
||||
---
|
||||
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
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From 6335e5c697c57d8b5854b8202de3733bcb151ca6 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 18 Jan 2019 22:05:37 +0100
|
||||
Subject: [PATCH] efilink: fix build with gcc 4.8
|
||||
|
||||
intptr_t is undefined without an include on stdint.h
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/a0ca37b5ed27af445344e3ac49dc87bb17512c50
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status:
|
||||
https://sourceforge.net/p/gnu-efi/code/merge-requests/3]
|
||||
---
|
||||
inc/efilink.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/inc/efilink.h b/inc/efilink.h
|
||||
index cc5aa2d..b69a6fd 100644
|
||||
--- a/inc/efilink.h
|
||||
+++ b/inc/efilink.h
|
||||
@@ -1,6 +1,10 @@
|
||||
#ifndef _EFI_LINK_H
|
||||
#define _EFI_LINK_H
|
||||
|
||||
+#if defined(__GNUC__)
|
||||
+#include <stdint.h>
|
||||
+#endif
|
||||
+
|
||||
/*++
|
||||
|
||||
Copyright (c) 1998 Intel Corporation
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From 3452721eafae90749f4af63264c412f398460b15 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 20 Jan 2019 21:07:11 +0100
|
||||
Subject: [PATCH] Make.defaults: don't override ARCH when cross-compiling
|
||||
|
||||
Don't override the user-provided ARCH when cross-compiling otherwise
|
||||
ARCH won't be correct for armv5, aarch64 and x86_64
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/2dfc0e10da25a8382a43557420d7dc3444c02dbb
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
Make.defaults | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Make.defaults b/Make.defaults
|
||||
index ba743f1..a0e5632 100755
|
||||
--- a/Make.defaults
|
||||
+++ b/Make.defaults
|
||||
@@ -67,7 +67,7 @@ ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[345678
|
||||
|
||||
# Get ARCH from the compiler if cross compiling
|
||||
ifneq ($(CROSS_COMPILE),)
|
||||
- override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' )
|
||||
+ ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' )
|
||||
endif
|
||||
|
||||
# FreeBSD (and possibly others) reports amd64 instead of x86_64
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -1,7 +1,14 @@
|
||||
config BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if BR2_ARM_CPU_HAS_ARM
|
||||
default y if BR2_aarch64
|
||||
default y if BR2_aarch64_be
|
||||
default y if BR2_i386
|
||||
default y if BR2_x86_64
|
||||
|
||||
config BR2_PACKAGE_GNU_EFI
|
||||
bool "gnu-efi"
|
||||
depends on BR2_ARM_CPU_HAS_ARM || BR2_aarch64 || \
|
||||
BR2_aarch64_be || BR2_i386 || BR2_x86_64
|
||||
depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS
|
||||
help
|
||||
Develop EFI applications for ARM-64, ARM-32, x86_64, IA-64
|
||||
(IPF), IA-32 (x86), and MIPS platforms using the GNU toolchain
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
# From http://sourceforge.net/projects/gnu-efi/files
|
||||
md5 46f633758a8a37db9fd6909fe270c26b gnu-efi-3.0.6.tar.bz2
|
||||
sha1 9f0f75b64c84423f3386da6f3200f5ed7471d9cb gnu-efi-3.0.6.tar.bz2
|
||||
md5 32af17b917545a693e549af2439c4a99 gnu-efi-3.0.9.tar.bz2
|
||||
sha1 9b39e06206e63eba56d59a648a7e4f20aead6962 gnu-efi-3.0.9.tar.bz2
|
||||
# Locally computed
|
||||
sha256 21515902d80fbea23328a61d70d3d51a47204abd1507ebfa27550a7b9bf22c91 gnu-efi-3.0.6.tar.bz2
|
||||
sha256 6715ea7eae1c7e4fc5041034bd3f107ec2911962ed284a081e491646b12277f0 gnu-efi-3.0.9.tar.bz2
|
||||
sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GNU_EFI_VERSION = 3.0.6
|
||||
GNU_EFI_VERSION = 3.0.9
|
||||
GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2
|
||||
GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi
|
||||
GNU_EFI_INSTALL_STAGING = YES
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user