b326961adf
Update openssl and package the debug symbols OBS-URL: https://build.opensuse.org/request/show/317610 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=100
63 lines
3.1 KiB
Diff
63 lines
3.1 KiB
Diff
From a508082e41339d929ae598c964562946287c1938 Mon Sep 17 00:00:00 2001
|
|
From: Gary Ching-Pang Lin <glin@suse.com>
|
|
Date: Mon, 13 Jul 2015 16:33:52 +0800
|
|
Subject: [PATCH] Specify the gnu89 standard
|
|
|
|
According to the gcc5 porting guideline (*), gcc5 defaults to
|
|
-std=gnu11 instead of -std=gnu89. Append -std=gnu89 to CFLAGS
|
|
to avoid the potential problems.
|
|
|
|
(*) https://gcc.gnu.org/gcc-5/porting_to.html
|
|
|
|
Based on the patch from Cristian Rodriguez <crrodriguez@opensuse.org>
|
|
|
|
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
|
|
---
|
|
Cryptlib/Makefile | 2 +-
|
|
Cryptlib/OpenSSL/Makefile | 2 +-
|
|
Makefile | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile
|
|
index cb18440..9a92304 100644
|
|
--- a/Cryptlib/Makefile
|
|
+++ b/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 \
|
|
-ffreestanding -I$(shell $(CC) -print-file-name=include)
|
|
|
|
ifeq ($(ARCH),x86_64)
|
|
diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile
|
|
index 3f87a94..ab6e7dd 100644
|
|
--- a/Cryptlib/OpenSSL/Makefile
|
|
+++ b/Cryptlib/OpenSSL/Makefile
|
|
@@ -2,7 +2,7 @@
|
|
EFI_INCLUDES = -I../Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -Icrypto/asn1 -Icrypto/evp -Icrypto/modes
|
|
|
|
CFLAGS = -ggdb -O0 -I. -I.. -I../Include/ -Icrypto -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar -nostdinc \
|
|
- -ffreestanding -I$(shell $(CC) -print-file-name=include) \
|
|
+ -ffreestanding -std=gnu89 -I$(shell $(CC) -print-file-name=include) \
|
|
-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_POSIX_IO -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_NO_RIPEMD -DOPENSSL_NO_RC2 -DOPENSSL_NO_IDEA -DOPENSSL_NO_BF -DOPENSSL_NO_CAST -DOPENSSL_NO_WHIRLPOOL -DOPENSSL_NO_DSA -DOPENSSL_NO_EC -DOPENSSL_NO_ECDH -DOPENSSL_NO_ECDSA -DOPENSSL_NO_SRP -DOPENSSL_NO_ENGINE -DOPENSSL_SMALL_FOOTPRINT -DPEDANTIC
|
|
|
|
ifeq ($(ARCH),x86_64)
|
|
diff --git a/Makefile b/Makefile
|
|
index 1181b8a..48e2a7d 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -28,7 +28,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 -ffreestanding \
|
|
+ -Werror=sign-compare -ffreestanding -std=gnu89 \
|
|
-I$(shell $(CC) -print-file-name=include) \
|
|
"-DDEFAULT_LOADER=L\"$(DEFAULT_LOADER)\"" \
|
|
"-DDEFAULT_LOADER_CHAR=\"$(DEFAULT_LOADER)\"" \
|
|
--
|
|
2.1.4
|
|
|