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 8452A15808B for ; Fri, 18 Feb 2022 03:07:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9118CE0824; Fri, 18 Feb 2022 03:07:07 +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 58893E0822 for ; Fri, 18 Feb 2022 03:07:07 +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 8BF12343368 for ; Fri, 18 Feb 2022 03:07:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92AA22E1 for ; Fri, 18 Feb 2022 03:06:59 +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: <1645152648.8deac5a404bdca06ad8ece68baee944325e46c35.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libdispatch/, dev-libs/libdispatch/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libdispatch/files/libdispatch-5.3.3-musl.patch dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild dev-libs/libdispatch/libdispatch-5.5.ebuild X-VCS-Directories: dev-libs/libdispatch/files/ dev-libs/libdispatch/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8deac5a404bdca06ad8ece68baee944325e46c35 X-VCS-Branch: master Date: Fri, 18 Feb 2022 03:06:59 +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: 21341c78-c240-4ba8-9924-35b167542a5c X-Archives-Hash: 3a844596e7a6a4deafa8c15c1fb7e3d5 commit: 8deac5a404bdca06ad8ece68baee944325e46c35 Author: Esteve Varela Colominas gmail com> AuthorDate: Mon Feb 14 08:09:12 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 18 02:50:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8deac5a4 dev-libs/libdispatch: Support musl No revbump; patches don't affect existing built versions. Closes: https://bugs.gentoo.org/829158 Signed-off-by: Esteve Varela Colominas gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24187 Signed-off-by: Sam James gentoo.org> .../libdispatch/files/libdispatch-5.3.3-musl.patch | 56 ++++++++++++++++++++++ dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild | 5 +- dev-libs/libdispatch/libdispatch-5.5.ebuild | 5 +- 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dev-libs/libdispatch/files/libdispatch-5.3.3-musl.patch b/dev-libs/libdispatch/files/libdispatch-5.3.3-musl.patch new file mode 100644 index 000000000000..a162b34efc53 --- /dev/null +++ b/dev-libs/libdispatch/files/libdispatch-5.3.3-musl.patch @@ -0,0 +1,56 @@ +Fix building with musl libc + +https://github.com/apple/swift-corelibs-libdispatch/pull/594/ +https://bugs.gentoo.org/829158 +https://bugs.gentoo.org/833306 + +--- a/dispatch/source.h ++++ b/dispatch/source.h +@@ -32,7 +32,7 @@ + #endif + + #if !defined(_WIN32) +-#include ++#include + #endif + + DISPATCH_ASSUME_NONNULL_BEGIN +--- a/os/generic_unix_base.h ++++ b/os/generic_unix_base.h +@@ -25,6 +25,14 @@ + + #if __has_include() + #include ++#else ++#if defined(__cplusplus) ++#define __BEGIN_DECLS extern "C" { ++#define __END_DECLS } ++#else ++#define __BEGIN_DECLS ++#define __END_DECLS ++#endif + #endif + + #ifndef API_AVAILABLE +--- a/src/shims/getprogname.h ++++ b/src/shims/getprogname.h +@@ -37,7 +37,7 @@ + static inline char * + getprogname(void) + { +-# if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME ++# if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME || defined(__linux__) + return program_invocation_short_name; + # elif defined(__ANDROID__) + return __progname; +--- a/tests/dispatch_test.c ++++ b/tests/dispatch_test.c +@@ -34,7 +34,7 @@ + #define HAS_SYS_EVENT_H 1 + #include + #else +-#include ++#include + #endif + #elif defined(_WIN32) + #include diff --git a/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild index 84d29b791acc..ac43a88ac6fc 100644 --- a/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild +++ b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild @@ -26,7 +26,10 @@ BDEPEND=" S="${WORKDIR}/${MY_PN}-${MY_PV}" -PATCHES=( "${FILESDIR}/remove-Werror.patch" ) +PATCHES=( + "${FILESDIR}/remove-Werror.patch" + "${FILESDIR}/libdispatch-5.3.3-musl.patch" +) src_configure () { if ! tc-is-clang ; then diff --git a/dev-libs/libdispatch/libdispatch-5.5.ebuild b/dev-libs/libdispatch/libdispatch-5.5.ebuild index 72ab2824900b..667e0171b3b0 100644 --- a/dev-libs/libdispatch/libdispatch-5.5.ebuild +++ b/dev-libs/libdispatch/libdispatch-5.5.ebuild @@ -29,7 +29,10 @@ BDEPEND=" S="${WORKDIR}/${MY_PN}-${MY_PV}" -PATCHES=( "${FILESDIR}/remove-Werror.patch" ) +PATCHES=( + "${FILESDIR}/remove-Werror.patch" + "${FILESDIR}/libdispatch-5.3.3-musl.patch" +) src_configure () { if ! tc-is-clang ; then