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 59A3A1581D3 for ; Tue, 21 May 2024 11:49:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B49D0E2A91; Tue, 21 May 2024 11:49:00 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 986CAE2A90 for ; Tue, 21 May 2024 11:49: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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C545335DC3 for ; Tue, 21 May 2024 11:48:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 090CA1AE6 for ; Tue, 21 May 2024 11:48:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1716292100.f51d73e7859d3df6589908082be198bdc34e4871.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/files/, sys-apps/iproute2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch sys-apps/iproute2/iproute2-6.6.0-r1.ebuild sys-apps/iproute2/iproute2-6.6.0-r3.ebuild sys-apps/iproute2/iproute2-6.6.0.ebuild sys-apps/iproute2/iproute2-6.8.0-r2.ebuild X-VCS-Directories: sys-apps/iproute2/files/ sys-apps/iproute2/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f51d73e7859d3df6589908082be198bdc34e4871 X-VCS-Branch: master Date: Tue, 21 May 2024 11:48:58 +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: 2882f231-4c5e-41a8-9b00-9457ccd74e9b X-Archives-Hash: ca7a773cb949719f17d1088b61718c4e commit: f51d73e7859d3df6589908082be198bdc34e4871 Author: Gabi Falk gmx com> AuthorDate: Sat May 11 09:00:00 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue May 21 11:48:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f51d73e7 sys-apps/iproute2: fix compilation on musl-based systems with modern C (C99) Closes: https://bugs.gentoo.org/922622 Signed-off-by: Gabi Falk gmx.com> Closes: https://github.com/gentoo/gentoo/pull/36638 Signed-off-by: Sam James gentoo.org> .../iproute2/files/iproute2-6.6.0-musl-c99.patch | 75 ++++++++++++++++++++++ sys-apps/iproute2/iproute2-6.6.0-r1.ebuild | 1 + sys-apps/iproute2/iproute2-6.6.0-r3.ebuild | 1 + sys-apps/iproute2/iproute2-6.6.0.ebuild | 1 + sys-apps/iproute2/iproute2-6.8.0-r2.ebuild | 1 + 5 files changed, 79 insertions(+) diff --git a/sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch b/sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch new file mode 100644 index 000000000000..c277bd6d1128 --- /dev/null +++ b/sys-apps/iproute2/files/iproute2-6.6.0-musl-c99.patch @@ -0,0 +1,75 @@ +From 12416003e4c691afc732d26f0a07c3890c24b396 Mon Sep 17 00:00:00 2001 +From: Gabi Falk +Date: Fri, 10 May 2024 14:36:12 +0000 +Subject: [PATCH] bridge/vlan.c: bridge/vlan.c: fix build with gcc 14 on musl + systems + +On glibc based systems the definition of 'struct timeval' is pulled in +with inclusion of header, but on musl based systems it +doesn't work this way. Missing definition triggers an +incompatible-pointer-types error with gcc 14 (warning on previous +versions of gcc): + +../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration + 80 | _PRINT_FUNC(tv, const struct timeval *) + | ^~~~~~~ +../include/json_print.h:50:37: note: in definition of macro '_PRINT_FUNC' + 50 | type value); \ + | ^~~~ +../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration + 80 | _PRINT_FUNC(tv, const struct timeval *) + | ^~~~~~~ +../include/json_print.h:55:45: note: in definition of macro '_PRINT_FUNC' + 55 | type value) \ + | ^~~~ +../include/json_print.h: In function 'print_tv': +../include/json_print.h:58:48: error: passing argument 5 of 'print_color_tv' from incompatible pointer type [-Wincompatible-pointer-types] + 58 | value); \ + | ^~~~~ + | | + | const struct timeval * + +Link: https://lore.kernel.org/netdev/20240510143613.1531283-1-gabifalk@gmx.com/T/#u +Signed-off-by: Gabi Falk +--- + bridge/vlan.c | 1 + + bridge/vni.c | 1 + + vdpa/vdpa.c | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/bridge/vlan.c b/bridge/vlan.c +index 5352eb24..0a7e6c45 100644 +--- a/bridge/vlan.c ++++ b/bridge/vlan.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/bridge/vni.c b/bridge/vni.c +index a7abe6de..e1f981fc 100644 +--- a/bridge/vni.c ++++ b/bridge/vni.c +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/vdpa/vdpa.c b/vdpa/vdpa.c +index 6e4a9c11..43f87824 100644 +--- a/vdpa/vdpa.c ++++ b/vdpa/vdpa.c +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild b/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild index f56e79070a8f..816d583a2935 100644 --- a/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild +++ b/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild @@ -53,6 +53,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch "${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727 "${FILESDIR}"/${PN}-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch + "${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622 ) src_prepare() { diff --git a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild index fc029883a9e9..9a1ab6a3936e 100644 --- a/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild +++ b/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild @@ -55,6 +55,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch "${FILESDIR}"/${PN}-6.6.0-revert-CONF_USR_DIR.patch "${FILESDIR}"/${PN}-6.6.0-makefile-use-usr-share-config.patch + "${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622 ) src_prepare() { diff --git a/sys-apps/iproute2/iproute2-6.6.0.ebuild b/sys-apps/iproute2/iproute2-6.6.0.ebuild index 97cae73173e9..45e7ac2e7a0b 100644 --- a/sys-apps/iproute2/iproute2-6.6.0.ebuild +++ b/sys-apps/iproute2/iproute2-6.6.0.ebuild @@ -52,6 +52,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727 "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch "${FILESDIR}"/${PN}-6.4.0-disable-libbsd-fallback.patch # bug #911727 + "${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622 ) src_prepare() { diff --git a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild index c5ab1aee142e..d74ccd7658b0 100644 --- a/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild +++ b/sys-apps/iproute2/iproute2-6.8.0-r2.ebuild @@ -52,6 +52,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727 "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch "${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727 + "${FILESDIR}"/${PN}-6.6.0-musl-c99.patch # bug #922622 ) src_prepare() {