| 1 |
commit: 9c3662f5ee8b460227b2e5fc1ec46aa88f03e982 |
| 2 |
Author: John Helmert III <ajak <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 29 05:12:27 2021 +0000 |
| 4 |
Commit: John Helmert III <ajak <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 8 19:31:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c3662f5 |
| 7 |
|
| 8 |
sys-firmware/edk2-ovmf: don't build with -Werror, python bump |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/801925 |
| 11 |
Acked-By: Matthias Maier <tamiko <AT> gentoo.org> |
| 12 |
Signed-off-by: John Helmert III <ajak <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild | 3 +- |
| 15 |
.../edk2-ovmf/files/edk2-ovmf-202105-werror.patch | 38 ++++++++++++++++++++++ |
| 16 |
2 files changed, 40 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild |
| 19 |
index 11376aff5d4..f2f2b9a2597 100644 |
| 20 |
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild |
| 21 |
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild |
| 22 |
@@ -4,7 +4,7 @@ |
| 23 |
EAPI=7 |
| 24 |
|
| 25 |
PYTHON_REQ_USE="sqlite" |
| 26 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
| 27 |
+PYTHON_COMPAT=( python3_{8,9,10} ) |
| 28 |
|
| 29 |
inherit python-any-r1 readme.gentoo-r1 |
| 30 |
|
| 31 |
@@ -54,6 +54,7 @@ DEPEND+=" |
| 32 |
RDEPEND="" |
| 33 |
|
| 34 |
PATCHES=( |
| 35 |
+ "${FILESDIR}/${PN}-202105-werror.patch" |
| 36 |
) |
| 37 |
|
| 38 |
S="${WORKDIR}/edk2-edk2-stable${PV}" |
| 39 |
|
| 40 |
diff --git a/sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch b/sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch |
| 41 |
new file mode 100644 |
| 42 |
index 00000000000..db71faed772 |
| 43 |
--- /dev/null |
| 44 |
+++ b/sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch |
| 45 |
@@ -0,0 +1,38 @@ |
| 46 |
+diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template |
| 47 |
+index 498696e..8a360f4 100755 |
| 48 |
+--- a/BaseTools/Conf/tools_def.template |
| 49 |
++++ b/BaseTools/Conf/tools_def.template |
| 50 |
+@@ -1863,7 +1863,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N |
| 51 |
+ *_*_*_DTCPP_PATH = DEF(DTCPP_BIN) |
| 52 |
+ *_*_*_DTC_PATH = DEF(DTC_BIN) |
| 53 |
+ |
| 54 |
+-DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common |
| 55 |
++DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -include AutoGen.h -fno-common |
| 56 |
+ DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe |
| 57 |
+ DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe |
| 58 |
+ DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft -fno-pic -fno-pie |
| 59 |
+diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile |
| 60 |
+index 0df728f..49f9706 100644 |
| 61 |
+--- a/BaseTools/Source/C/Makefiles/header.makefile |
| 62 |
++++ b/BaseTools/Source/C/Makefiles/header.makefile |
| 63 |
+@@ -82,17 +82,17 @@ BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS) |
| 64 |
+ |
| 65 |
+ ifeq ($(DARWIN),Darwin) |
| 66 |
+ # assume clang or clang compatible flags on OS X |
| 67 |
+-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ |
| 68 |
++BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall \ |
| 69 |
+ -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g |
| 70 |
+ else |
| 71 |
+ ifeq ($(CXX), llvm) |
| 72 |
+ BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ |
| 73 |
+--fno-delete-null-pointer-checks -Wall -Werror \ |
| 74 |
++-fno-delete-null-pointer-checks -Wall \ |
| 75 |
+ -Wno-deprecated-declarations -Wno-self-assign \ |
| 76 |
+ -Wno-unused-result -nostdlib -g |
| 77 |
+ else |
| 78 |
+ BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ |
| 79 |
+--fno-delete-null-pointer-checks -Wall -Werror \ |
| 80 |
++-fno-delete-null-pointer-checks -Wall \ |
| 81 |
+ -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \ |
| 82 |
+ -Wno-unused-result -nostdlib -g |
| 83 |
+ endif |
Archives