From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17EC115A7D9 for ; Thu, 23 Mar 2023 15:55:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A61EE07C5; Thu, 23 Mar 2023 15:55:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DFAF8E07C5 for ; Thu, 23 Mar 2023 15:55:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF240340C98 for ; Thu, 23 Mar 2023 15:54:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 229D14A2 for ; Thu, 23 Mar 2023 15:54:56 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1679586888.1bb1ddae1e788f78eb2f7dd47f2f2f92e5fc7a94.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/files/, sys-fs/multipath-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/multipath-tools/files/multipath-tools-0.9.4-remove-Werror.patch sys-fs/multipath-tools/multipath-tools-0.9.4-r1.ebuild X-VCS-Directories: sys-fs/multipath-tools/ sys-fs/multipath-tools/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 1bb1ddae1e788f78eb2f7dd47f2f2f92e5fc7a94 X-VCS-Branch: master Date: Thu, 23 Mar 2023 15:54:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9e31fa8b-fcdd-429f-8b0f-4f41507c4a50 X-Archives-Hash: 532a47fe37017c2a1baf5ceb76ec090e commit: 1bb1ddae1e788f78eb2f7dd47f2f2f92e5fc7a94 Author: David Seifert gentoo org> AuthorDate: Thu Mar 23 15:54:48 2023 +0000 Commit: David Seifert gentoo 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 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 \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 \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 }