diff options
| author |   John Helmert III <ajak@gentoo.org> | 2021-08-29 00:12:27 -0500 |
|---|---|---|
| committer | John Helmert III <ajak@gentoo.org> | 2021-09-08 14:31:07 -0500 |
| commit | 9c3662f5ee8b460227b2e5fc1ec46aa88f03e982 (patch) | |
| tree | a57b4a1d04ed5d0bbe7267fab89bc534bf491703 /sys-firmware | |
| parent | sys-apps/systemd: add fido2 USE flag (diff) | |
| download | gentoo-9c3662f5ee8b460227b2e5fc1ec46aa88f03e982.tar.gz gentoo-9c3662f5ee8b460227b2e5fc1ec46aa88f03e982.tar.bz2 gentoo-9c3662f5ee8b460227b2e5fc1ec46aa88f03e982.zip | |
sys-firmware/edk2-ovmf: don't build with -Werror, python bump
Closes: https://bugs.gentoo.org/801925
Acked-By: Matthias Maier <tamiko@gentoo.org>
Signed-off-by: John Helmert III <ajak@gentoo.org>
Diffstat (limited to 'sys-firmware')
| -rw-r--r-- | sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild | 3 | ||||
| -rw-r--r-- | sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch | 38 |
2 files changed, 40 insertions, 1 deletions
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild index 11376aff5d43..f2f2b9a2597f 100644 --- a/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild +++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) inherit python-any-r1 readme.gentoo-r1 @@ -54,6 +54,7 @@ DEPEND+=" RDEPEND="" PATCHES=( + "${FILESDIR}/${PN}-202105-werror.patch" ) S="${WORKDIR}/edk2-edk2-stable${PV}" diff --git a/sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch b/sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch new file mode 100644 index 000000000000..db71faed7728 --- /dev/null +++ b/sys-firmware/edk2-ovmf/files/edk2-ovmf-202105-werror.patch @@ -0,0 +1,38 @@ +diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template +index 498696e..8a360f4 100755 +--- a/BaseTools/Conf/tools_def.template ++++ b/BaseTools/Conf/tools_def.template +@@ -1863,7 +1863,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N + *_*_*_DTCPP_PATH = DEF(DTCPP_BIN)
+ *_*_*_DTC_PATH = DEF(DTC_BIN)
+
+-DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common
++DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -include AutoGen.h -fno-common
+ DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe
+ DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe
+ 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
+diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile +index 0df728f..49f9706 100644 +--- a/BaseTools/Source/C/Makefiles/header.makefile ++++ b/BaseTools/Source/C/Makefiles/header.makefile +@@ -82,17 +82,17 @@ BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS) +
+ ifeq ($(DARWIN),Darwin)
+ # assume clang or clang compatible flags on OS X
+-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \
++BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall \
+ -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g
+ else
+ ifeq ($(CXX), llvm)
+ BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
+--fno-delete-null-pointer-checks -Wall -Werror \
++-fno-delete-null-pointer-checks -Wall \
+ -Wno-deprecated-declarations -Wno-self-assign \
+ -Wno-unused-result -nostdlib -g
+ else
+ BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
+--fno-delete-null-pointer-checks -Wall -Werror \
++-fno-delete-null-pointer-checks -Wall \
+ -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \
+ -Wno-unused-result -nostdlib -g
+ endif
|