mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 14:31:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-firmware/edk2: Support GCC 5 and later

Browse Source
This commit is contained in:
David Michael 2017-07-26 12:51:03 -07:00
parent 6a4322e6a7
commit 3807de7287
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-2017.06.ebuild → sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-2017.06-r1.ebuild vendored
View File

3
sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/edk2-99999.ebuild vendored
View File

@ -62,6 +62,7 @@ src_configure() {
TARGET_NAME=$(usex debug DEBUG RELEASE) TARGET_NAME=$(usex debug DEBUG RELEASE)
TARGET_TOOLS="GCC$(gcc-version | tr -d .)" TARGET_TOOLS="GCC$(gcc-version | tr -d .)"
[[ $TARGET_TOOLS == GCC[5-9]* ]] && TARGET_TOOLS=GCC5
case ${ARCH} in case ${ARCH} in
amd64) TARGET_ARCH=X64 ;; amd64) TARGET_ARCH=X64 ;;
@ -77,7 +78,7 @@ src_compile() {
emake -C BaseTools -j1 emake -C BaseTools -j1
ARCH=${arch_save} ARCH=${arch_save}
export GCC49_AARCH64_PREFIX="${CHOST}-" export "${TARGET_TOOLS}_AARCH64_PREFIX=${CHOST}-"
source ./edksetup.sh || die "edksetup.sh failed." source ./edksetup.sh || die "edksetup.sh failed."
case ${ARCH} in case ${ARCH} in

8
sdk_container/src/third_party/coreos-overlay/sys-firmware/edk2/files/edk2-2017.06-BaseTools.patch vendored
View File

@ -15,7 +15,7 @@ index 063982b82f..693e08b942 100644
BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g
endif endif
-BUILD_LFLAGS = -BUILD_LFLAGS =
+BUILD_LFLAGS = -nopie +BUILD_LFLAGS = -no-pie
BUILD_CXXFLAGS = -Wno-unused-result BUILD_CXXFLAGS = -Wno-unused-result
ifeq ($(ARCH), IA32) ifeq ($(ARCH), IA32)
@ -27,7 +27,7 @@ index 2ebf3e0465..b81f51ecd7 100644
APPLICATION = $(MAKEROOT)/bin/$(APPNAME) APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
+LFLAGS = -nopie +LFLAGS = -no-pie
+ +
.PHONY:all .PHONY:all
all: $(MAKEROOT)/bin $(APPLICATION) all: $(MAKEROOT)/bin $(APPLICATION)
@ -41,7 +41,7 @@ index 8f2cc78c59..5bac6f9e5d 100644
OBJ_EXT=o OBJ_EXT=o
OUT_OBJ = -o OUT_OBJ = -o
-BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536 -BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
+BUILD_CFLAGS= -nopie $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536 +BUILD_CFLAGS= -no-pie $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
BUILD_CPPFLAGS= BUILD_CPPFLAGS=
# #
# SGI Users, use this CFLAGS # SGI Users, use this CFLAGS
@ -54,7 +54,7 @@ index b3a34d3b46..1676ee7761 100644
ANTLR=${BIN_DIR}/antlr ANTLR=${BIN_DIR}/antlr
DLG=${BIN_DIR}/dlg DLG=${BIN_DIR}/dlg
-BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536 -BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
+BUILD_CFLAGS= -nopie $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536 +BUILD_CFLAGS= -no-pie $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
BUILD_CPPFLAGS= BUILD_CPPFLAGS=
OBJ_EXT=o OBJ_EXT=o
OUT_OBJ = -o OUT_OBJ = -o