packages/gnu-efi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!6 delete modify-cflags.patch

Browse Source 
Merge pull request !6 from lkx690/master
This commit is contained in:
openeuler-ci-bot 2020-03-18 23:43:44 +08:00 committed by Gitee
commit 365e90209a
2 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu-efi.spec
View File

@ -1,7 +1,7 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: gnu-efi Name: gnu-efi
Version: 3.0.8 Version: 3.0.8
Release: 7 Release: 8
Summary: Development Libraries and headers for EFI Summary: Development Libraries and headers for EFI
Epoch: 1 Epoch: 1
License: BSD License: BSD
@ -10,7 +10,6 @@ ExclusiveArch: x86_64 aarch64
Source: http://superb-dca2.dl.sourceforge.net/project/gnu-efi/gnu-efi-3.0.8.tar.bz2 Source: http://superb-dca2.dl.sourceforge.net/project/gnu-efi/gnu-efi-3.0.8.tar.bz2
#stubs-32.h comes from http://www.gnu.org/software/glibc/ #stubs-32.h comes from http://www.gnu.org/software/glibc/
Source1: stubs-32.h Source1: stubs-32.h
Patch1: modify-cflags.patch
%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed 's/^ID=//')) %global efidir %(eval echo $(grep ^ID= /etc/os-release | sed 's/^ID=//'))
@ -77,6 +76,9 @@ mv ia32/apps/{route80h.efi,modelist.efi} %{buildroot}/boot/efi/EFI/%{efidir}/ia3
%{_includedir}/efi %{_includedir}/efi
%changelog %changelog
* Wed Mar 18 2020 likexin <likexin4@huawei.com> - 3.0.8-8
- Delete modify-cflags.patch
* Wed Mar 18 2020 likexin <likexin4@huawei.com> - 3.0.8-7 * Wed Mar 18 2020 likexin <likexin4@huawei.com> - 3.0.8-7
- Fix up modify-cflags.patch - Fix up modify-cflags.patch

36
modify-cflags.patch
View File

@ -1,36 +0,0 @@
diff -Nur gnu-efi-3.0.8.orig/Make.defaults gnu-efi-3.0.8/Make.defaults
--- gnu-efi-3.0.8.orig/Make.defaults 2018-03-15 02:54:51.000000000 +0800
+++ gnu-efi-3.0.8/Make.defaults 2020-03-18 15:33:04.818719470 +0800
@@ -155,6 +155,9 @@
CFLAGS += -marm
endif
+ifeq ($(ARCH),aarch64)
+CFLAGS += -fstack-protector-strong
+endif
# Generic compilation flags
INCDIR += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \
-I$(TOPDIR)/inc/protocol
@@ -168,16 +171,18 @@
ifeq (FreeBSD, $(findstring FreeBSD, $(OS)))
CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
-fshort-wchar -fno-strict-aliasing \
- -ffreestanding -fno-stack-protector
+ -ffreestanding -fno-stack-protector
else
CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
-fshort-wchar -fno-strict-aliasing \
- -ffreestanding -fno-stack-protector -fno-stack-check \
- -fno-stack-check \
+ -ffreestanding \
$(if $(findstring gcc,$(CC)),-fno-merge-all-constants,)
+ifneq ($(ARCH),aarch64)
+CFLAGS += -fno-stack-protector -fno-stack-check
+endif
endif
ARFLAGS := rDv
ASFLAGS += $(ARCH3264)
-LDFLAGS += -nostdlib --warn-common --no-undefined --fatal-warnings \
+LDFLAGS += -nostdlib --warn-common --fatal-warnings \
--build-id=sha1