From 2b0cb62f0aee4ffacdc2c684554cb06bbffe2448eb283f0fc70941f6fa9257d7 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Tue, 7 Apr 2015 07:39:55 +0000 Subject: [PATCH] Accepting request 294215 from home:elvigia:branches:devel:openSUSE:Factory - shim-gcc5.patch: shim needs -std=gnu89 to build with GCC5 OBS-URL: https://build.opensuse.org/request/show/294215 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=95 --- shim-gcc5.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++ shim.changes | 5 +++++ shim.spec | 5 +++-- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 shim-gcc5.patch diff --git a/shim-gcc5.patch b/shim-gcc5.patch new file mode 100644 index 0000000..9a60734 --- /dev/null +++ b/shim-gcc5.patch @@ -0,0 +1,44 @@ +--- shim-0.8.orig/Makefile ++++ shim-0.8/Makefile +@@ -21,7 +21,7 @@ EFI_LDS = elf_$(ARCH)_efi.lds + DEFAULT_LOADER := \\\\grub.efi + CFLAGS = -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \ + -fshort-wchar -Wall -Wsign-compare -Werror -fno-builtin \ +- -Werror=sign-compare \ ++ -Werror=sign-compare -std=gnu89 \ + "-DDEFAULT_LOADER=L\"$(DEFAULT_LOADER)\"" \ + "-DDEFAULT_LOADER_CHAR=\"$(DEFAULT_LOADER)\"" \ + $(EFI_INCLUDES) +--- shim-0.8.orig/Cryptlib/Makefile ++++ shim-0.8/Cryptlib/Makefile +@@ -2,7 +2,7 @@ + EFI_INCLUDES = -IInclude -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol + + CFLAGS = -ggdb -O0 -I. -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar \ +- -Wall $(EFI_INCLUDES) ++ -Wall $(EFI_INCLUDES) -std=gnu89 + CFLAGS += -DGNU_EFI_USE_EXTERNAL_STDARG + + ifeq ($(ARCH),x86_64) +--- shim-0.8.orig/Cryptlib/OpenSSL/Makefile ++++ shim-0.8/Cryptlib/OpenSSL/Makefile +@@ -2,7 +2,7 @@ + EFI_INCLUDES = -I../Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol + + CFLAGS = -ggdb -O0 -I. -I.. -I../Include/ -Icrypto -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar -nostdinc \ +- -Wall $(EFI_INCLUDES) -DOPENSSL_SYSNAME_UWIN -DOPENSSL_SYS_UEFI -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_SOCK -DOPENSSL_NO_CMS -DOPENSSL_NO_JPAKE -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_ERR -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE -DGETPID_IS_MEANINGLESS -DOPENSSL_NO_STDIO -DOPENSSL_NO_FP_API -DOPENSSL_NO_DGRAM -DOPENSSL_NO_SHA0 -DOPENSSL_NO_LHASH -DOPENSSL_NO_HW -DOPENSSL_NO_OCSP -DOPENSSL_NO_LOCKING -DOPENSSL_NO_DEPRECATED -DOPENSSL_SMALL_FOOTPRINT -DPEDANTIC ++ -Wall -std=gnu89 $(EFI_INCLUDES) -DOPENSSL_SYSNAME_UWIN -DOPENSSL_SYS_UEFI -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_SOCK -DOPENSSL_NO_CMS -DOPENSSL_NO_JPAKE -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_ERR -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE -DGETPID_IS_MEANINGLESS -DOPENSSL_NO_STDIO -DOPENSSL_NO_FP_API -DOPENSSL_NO_DGRAM -DOPENSSL_NO_SHA0 -DOPENSSL_NO_LHASH -DOPENSSL_NO_HW -DOPENSSL_NO_OCSP -DOPENSSL_NO_LOCKING -DOPENSSL_NO_DEPRECATED -DOPENSSL_SMALL_FOOTPRINT -DPEDANTIC + + ifeq ($(ARCH),x86_64) + CFLAGS += -mno-mmx -mno-sse -mno-red-zone -maccumulate-outgoing-args \ +--- shim-0.8.orig/lib/Makefile ++++ shim-0.8/lib/Makefile +@@ -5,7 +5,7 @@ LIBFILES = simple_file.o guid.o console. + EFI_INCLUDES = -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -I../include + + CFLAGS = -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic -nostdinc\ +- -fshort-wchar -Wall -DBUILD_EFI -fno-builtin -Werror \ ++ -fshort-wchar -Wall -DBUILD_EFI -fno-builtin -Werror -std=gnu89 \ + $(EFI_INCLUDES) + + ifeq ($(ARCH),x86_64) diff --git a/shim.changes b/shim.changes index 2b23568..2fca971 100644 --- a/shim.changes +++ b/shim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 2 16:31:28 UTC 2015 - crrodriguez@opensuse.org + +- shim-gcc5.patch: shim needs -std=gnu89 to build with GCC5 + ------------------------------------------------------------------- Tue Feb 17 06:02:34 UTC 2015 - mchang@suse.com diff --git a/shim.spec b/shim.spec index 102d8f8..728fe0f 100644 --- a/shim.spec +++ b/shim.spec @@ -1,7 +1,7 @@ # # spec file for package shim # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -50,6 +50,7 @@ Patch3: shim-fix-gnu-efi-30w.patch Patch4: shim-fix-mokmanager-sections.patch # PATCH-FIX-OPENSUSE shim-opensuse-cert-prompt.patch glin@suse.com -- Show the prompt to ask whether the user trusts openSUSE certificate or not Patch100: shim-opensuse-cert-prompt.patch +Patch101: shim-gcc5.patch BuildRequires: gnu-efi >= 3.0t BuildRequires: mozilla-nss-tools BuildRequires: openssl >= 0.9.8 @@ -78,7 +79,7 @@ Authors: %patch3 -p1 %patch4 -p1 %patch100 -p1 - +%patch101 -p1 %build # first, build MokManager and fallback as they don't depend on a # specific certificate