diff --git a/multipath-tools/.SRCINFO b/multipath-tools/.SRCINFO index 9f69eaf9c9..6fc35f7526 100644 --- a/multipath-tools/.SRCINFO +++ b/multipath-tools/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = multipath-tools pkgdesc = Multipath tools for Linux (including kpartx) - pkgver = 0.10.0 + pkgver = 0.11.0 pkgrel = 1 url = https://github.com/opensvc/multipath-tools arch = x86_64 @@ -22,7 +22,9 @@ pkgbase = multipath-tools depends = liburcu depends = systemd-libs depends = util-linux-libs - source = multipath-tools::git+https://github.com/opensvc/multipath-tools#tag=0.10.0 - sha256sums = 52e5ac6c5fd51b4605faf3fe18f90fdf76124e00b622897d9ba0d24263b52353 + source = multipath-tools::git+https://github.com/opensvc/multipath-tools#tag=0.11.0 + source = multipath-tools-no-werror.patch + sha256sums = 380a8333695103cf1a4546756eaf7daa13469832edac6f33b72fde8d51393e21 + sha256sums = badfbeeba7859e1986de7ac53b7a34f4929100552f0f158a24091966dd9ca316 pkgname = multipath-tools diff --git a/multipath-tools/PKGBUILD b/multipath-tools/PKGBUILD index efe19f1274..affcd05ef0 100644 --- a/multipath-tools/PKGBUILD +++ b/multipath-tools/PKGBUILD @@ -1,3 +1,4 @@ +# POWER Maintainer: Alexander Baldeck # Maintainer: Robin Broda # Contributor: Michael Lass # Contributor: Justin Dray @@ -8,7 +9,7 @@ # Contributor: Matt Heagney pkgname=multipath-tools -pkgver=0.10.0 +pkgver=0.11.0 pkgrel=1 pkgdesc='Multipath tools for Linux (including kpartx)' arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) @@ -16,8 +17,10 @@ url='https://github.com/opensvc/multipath-tools' license=('GPL-2.0-or-later' 'GPL-3.0-or-later' 'LGPL-2.0-or-later' 'LGPL-2.1-or-later') depends=('glibc' 'gcc-libs' 'libaio' 'device-mapper' 'json-c' 'liburcu' 'systemd-libs' 'util-linux-libs') makedepends=('git' 'systemd') -source=("multipath-tools::git+https://github.com/opensvc/multipath-tools#tag=${pkgver}") -sha256sums=('52e5ac6c5fd51b4605faf3fe18f90fdf76124e00b622897d9ba0d24263b52353') +source=("multipath-tools::git+https://github.com/opensvc/multipath-tools#tag=${pkgver}" + multipath-tools-no-werror.patch) +sha256sums=('380a8333695103cf1a4546756eaf7daa13469832edac6f33b72fde8d51393e21' + 'badfbeeba7859e1986de7ac53b7a34f4929100552f0f158a24091966dd9ca316') _make_opts=( prefix='/usr/' @@ -26,8 +29,13 @@ _make_opts=( configfile='/etc/multipath.conf' statedir='/etc/multipath' LIB='lib' + WARN_ONLY=1 ) +prepare() { + cd "${pkgname}" + patch -Np1 -i ${srcdir}/multipath-tools-no-werror.patch +} build() { cd "${pkgname}" diff --git a/multipath-tools/multipath-tools-no-werror.patch b/multipath-tools/multipath-tools-no-werror.patch new file mode 100644 index 0000000000..769c110ae4 --- /dev/null +++ b/multipath-tools/multipath-tools-no-werror.patch @@ -0,0 +1,47 @@ +--- multipath-tools.org/create-config.mk 2025-02-09 15:13:02.727244979 +0100 ++++ multipath-tools/create-config.mk 2025-02-09 15:14:32.754157269 +0100 +@@ -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 +@@ -136,7 +136,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 \ +@@ -148,11 +148,11 @@ + # but it doesn't seem to make a difference wrt the compilation result. + FORTIFY_OPT := $(shell \ + if printf '$(__HASH__)include \nint main(void) { return 0; }\n' | \ +- $(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 printf '$(__HASH__)include \nint main(void) { return 0; }\n' | \ +- $(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) +--- multipath-tools.org/Makefile.inc 2025-02-09 15:13:02.727244979 +0100 ++++ multipath-tools/Makefile.inc 2025-02-09 15:25:08.074051437 +0100 +@@ -105,8 +105,8 @@ + WARN_ONLY := + ERROR := $(if $(WARN_ONLY),,error=) + WERROR := $(if $(WARN_ONLY),,-Werror) +-WARNFLAGS := $(WERROR) -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -W$(ERROR)implicit-int \ +- -W$(ERROR)implicit-function-declaration -W$(ERROR)format-security \ ++WARNFLAGS := $(WERROR) -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -W$(ERROR)format-security \ ++ -Wno-implicit-function-declaration \ + $(WNOCLOBBERED) -W$(ERROR)cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS) + + CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \