[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/files/, sys-fs/multipath-tools/

["David Seifert" <soap@gentoo.org>]

commit:     1bb1ddae1e788f78eb2f7dd47f2f2f92e5fc7a94
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 15:54:48 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 15:54:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb1ddae

sys-fs/multipath-tools: remove -Werror from build

Closes: https://bugs.gentoo.org/902811
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../multipath-tools-0.9.4-remove-Werror.patch      | 45 ++++++++++++++++++++++
 .../multipath-tools-0.9.4-r1.ebuild                |  6 +--
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.9.4-remove-Werror.patch b/sys-fs/multipath-tools/files/multipath-tools-0.9.4-remove-Werror.patch
new file mode 100644
index 000000000000..58c8ae291ce8
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.9.4-remove-Werror.patch
@@ -0,0 +1,45 @@
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -79,7 +79,7 @@
+ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo 1),-lsystemd,-lsystemd-daemon))
+ 
+ OPTFLAGS	:= -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
+-WARNFLAGS	:= -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
++WARNFLAGS	:= -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
+ 		  -Werror=implicit-function-declaration -Werror=format-security \
+ 		  $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS)
+ CPPFLAGS	:= $(FORTIFY_OPT) $(CPPFLAGS) \
+--- a/create-config.mk
++++ b/create-config.mk
+@@ -64,7 +64,7 @@
+ # gcc 4.8 compiles blacklist.c only with -Wno-missing-field-initializers
+ TEST_MISSING_INITIALIZERS = $(shell \
+ 	echo 'struct A {int a, b;}; struct B {struct A a; int b;} b = {.a.a=1};' | \
+-		$(CC) -c -Werror -Wmissing-field-initializers -o /dev/null -xc - >/dev/null 2>&1 \
++		$(CC) -c -Wmissing-field-initializers -o /dev/null -xc - >/dev/null 2>&1 \
+ 	|| echo -Wno-missing-field-initializers)
+ 
+ # gcc 4.8.4 and certain versions of liburcu fail to compile this with -Werror=type-limits
+@@ -123,7 +123,7 @@
+ # Evaluates to "option" if yes, and "fallback" otherwise.
+ TEST_CC_OPTION = $(shell \
+ 	if echo 'int main(void){return 0;}' | \
+-		$(CC) -o /dev/null -c -Werror "$(1)" -xc - >/dev/null 2>&1; \
++		$(CC) -o /dev/null -c "$(1)" -xc - >/dev/null 2>&1; \
+ 	then \
+ 		echo "$(1)"; \
+ 	else \
+@@ -135,11 +135,11 @@
+ # but it doesn't seem to make a difference wrt the compilation result.
+ FORTIFY_OPT := $(shell \
+ 	if /bin/echo -e '$(__HASH__)include <string.h>\nint main(void) { return 0; }' | \
+-		$(CC) -o /dev/null $(OPTFLAGS) -c -Werror -D_FORTIFY_SOURCE=3 -xc - 2>/dev/null; \
++		$(CC) -o /dev/null $(OPTFLAGS) -c -D_FORTIFY_SOURCE=3 -xc - 2>/dev/null; \
+ 	then \
+ 		echo "-D_FORTIFY_SOURCE=3"; \
+ 	elif /bin/echo -e '$(__HASH__)include <string.h>\nint main(void) { return 0; }' | \
+-		$(CC) -o /dev/null $(OPTFLAGS) -c -Werror -D_FORTIFY_SOURCE=2 -xc - 2>/dev/null; \
++		$(CC) -o /dev/null $(OPTFLAGS) -c -D_FORTIFY_SOURCE=2 -xc - 2>/dev/null; \
+ 	then \
+ 		echo "-D_FORTIFY_SOURCE=2"; \
+ 	fi)

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
index 8fbf1e4ee6b4..a6d47abdd5b7 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic linux-info systemd tmpfiles toolchain-funcs udev
+inherit linux-info systemd tmpfiles toolchain-funcs udev
 
 DESCRIPTION="Device mapper target autoconfig"
 HOMEPAGE="http://christophe.varoqui.free.fr/"
@@ -34,6 +34,7 @@ CONFIG_CHECK="~DM_MULTIPATH"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.4-test-fix.patch
+	"${FILESDIR}"/${PN}-0.9.4-remove-Werror.patch
 )
 
 myemake() {
@@ -63,9 +64,6 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
-
-	append-flags -Wno-error
-
 	myemake
 }