From 6138b3ddc30b1f5fc4249dc30b5f465d81c108c1 Mon Sep 17 00:00:00 2001
From: guoxiaoqi <guoxiaoqi2@huawei.com>
Date: Wed, 18 Mar 2020 23:03:57 +0800
Subject: [PATCH] fix build error caused by -fstack-protector-strong of
 /usr/lib64/libefi.a

---
 0001-remove-no-undefined.patch | 23 +++++++++++++++++++++++
 shim.spec                      |  6 +++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 0001-remove-no-undefined.patch

diff --git a/0001-remove-no-undefined.patch b/0001-remove-no-undefined.patch
new file mode 100644
index 0000000..31f15ea
--- /dev/null
+++ b/0001-remove-no-undefined.patch
@@ -0,0 +1,23 @@
+From e39ef3c849823488869ca5ac824e7a13e37812a6 Mon Sep 17 00:00:00 2001
+From: guoxiaoqi <guoxiaoqi2@huawei.com>
+Date: Wed, 18 Mar 2020 22:44:34 +0800
+Subject: [PATCH] remove --no-undefined
+
+Signed-off-by: guoxiaoqi <guoxiaoqi2@huawei.com>
+---
+ Make.defaults | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Make.defaults b/Make.defaults
+index e11ab5a..b645101 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -126,4 +126,4 @@ ifneq ($(origin VENDOR_DBX_FILE), undefined)
+ 	CFLAGS += -DVENDOR_DBX_FILE=\"$(VENDOR_DBX_FILE)\"
+ endif
+ 
+-LDFLAGS		= --hash-style=sysv -nostdlib -znocombreloc -T $(EFI_LDS) -shared -Bsymbolic -L$(EFI_PATH) -L$(LIBDIR) -LCryptlib -LCryptlib/OpenSSL $(EFI_CRT_OBJS) --build-id=sha1 $(ARCH_LDFLAGS) --no-undefined
++LDFLAGS		= --hash-style=sysv -nostdlib -znocombreloc -T $(EFI_LDS) -shared -Bsymbolic -L$(EFI_PATH) -L$(LIBDIR) -LCryptlib -LCryptlib/OpenSSL $(EFI_CRT_OBJS) --build-id=sha1 $(ARCH_LDFLAGS)
+-- 
+1.8.3.1
+
diff --git a/shim.spec b/shim.spec
index 0df6a90..0797c59 100644
--- a/shim.spec
+++ b/shim.spec
@@ -22,7 +22,7 @@
 
 Name:		shim
 Version:	15
-Release:        18
+Release:        19
 Summary:	First-stage UEFI bootloader
 ExclusiveArch:  x86_64 aarch64
 License:	BSD
@@ -30,6 +30,7 @@ URL:		https://github.com/rhboot/shim
 Source0:	https://github.com/rhboot/shim/releases/download/%{version}/shim-%{version}.tar.bz2
 Source1:        BOOTAA64.CSV
 Source2:        BOOTX64.CSV
+Patch0:         0001-remove-no-undefined.patch
 
 BuildRequires:	elfutils-libelf-devel openssl-devel openssl git pesign gnu-efi gnu-efi-devel gcc
 Requires:       dbxtool efi-filesystem mokutil
@@ -128,6 +129,9 @@ cd ..
 /usr/src/debug/%{name}-%{version}-%{release}/*
 
 %changelog
+* Wed Mar 18 2020 openEuler Buildteam <buildteam@openeuler.org> - 15-18
+- fix build error caused by -fstack-protector-strong of /usr/lib64/libefi.a
+
 * Tue Mar 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 15-18
 - fix wrong information
 
-- 
Gitee