From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- dev-libs/libdispatch/Manifest | 5 +- .../libdispatch/files/libdispatch-5.3.3-musl.patch | 56 ++++++++++++++++++++++ dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild | 7 ++- dev-libs/libdispatch/libdispatch-5.5.ebuild | 53 ++++++++++++++++++++ 4 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 dev-libs/libdispatch/files/libdispatch-5.3.3-musl.patch create mode 100644 dev-libs/libdispatch/libdispatch-5.5.ebuild (limited to 'dev-libs/libdispatch') diff --git a/dev-libs/libdispatch/Manifest b/dev-libs/libdispatch/Manifest index 9cb2560adb43..a0ab9c8bec66 100644 --- a/dev-libs/libdispatch/Manifest +++ b/dev-libs/libdispatch/Manifest @@ -1,4 +1,7 @@ +AUX libdispatch-5.3.3-musl.patch 1213 BLAKE2B 76db17275b46160840867ae2956b58f38bafa55539a0396ad910df30747a766f170cf57d7229f12d11dba7bddc37978da501335904a482c0dbc041939db169d6 SHA512 4e8f20a20454c84fcf6ba45e2560053283a4c38955151718bcc96d03f326e2d9c7b5782848acca412166675d3b5daee6369f47ba672023bb047a0c08237b1008 AUX remove-Werror.patch 1217 BLAKE2B f7ef18089abcd11fb8ed36980e681a804649b8ad8891b97113966c099bb05178604983359b79eb853ad6256a6c116fa8fdca116b29e2d6108c2a38fff01472a1 SHA512 0c17b1b36a02b401182a91e1f751f71b343f1d61ce7340230fdb13e89354316d0f2863fc3ea2f1a33bee6033c79e30e35024519c515a03a4d88467456ef340cc DIST libdispatch-5.3.3.tar.gz 591794 BLAKE2B 982b99227a1292d999639e7b16c1382a38dd6799a0ea1b83dd66333d5b6388be809127565fafc7f171dab9d8aa388cf67316d7eb6fa2ae2e1b8ccf660b32f0ab SHA512 b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909 -EBUILD libdispatch-5.3.3-r1.ebuild 1013 BLAKE2B 6e71f0a4c7304d9bf72a3e05db52b3105d1cd97ed01583bf5327af0825b6da4709439357e303e27abd117d3b502040a18c34fc221de1961c90ad43560e6ec6a2 SHA512 64441726d02a68aa4c0cd23dda4cbc82ac1c6b5c7abb627bad4a363cc43832721abc033611c763216df25bf18c5f00500cff009b0454ed8fa3023dd5f348bad3 +DIST libdispatch-5.5.tar.gz 592054 BLAKE2B 500ae44069063f202b48cfab2df1fb7fc012f1a1048d2460054e34f18629feefd38952d08f9de310d71774120a0516b4f9210147869e2ce34c266bf44e6fa0d7 SHA512 58ad7122d2fac7b117f4e81eec2b5c1dfdf5256865337110d660790744e83c3fea5e82fbe521b6e56fd0e2f09684e5e1475cf2cac67989a8f78dd0a284fb0d21 +EBUILD libdispatch-5.3.3-r1.ebuild 1065 BLAKE2B 34f48796234e44a1c856c7cbba8caded4998e8200ce2799820cb2cde28c72c882d459fad02723c2d77819db8be1e551a6065358811a20091d4a7ce011ea9e100 SHA512 338c0902dcf7fe48bfb8bdb26b695bc78325c737b7425ec31765e74f6ccf8d1d28e4b2a072d09436f3e85876067d0bdd665e6ee2b5cce9ab953e6b656cc8747f +EBUILD libdispatch-5.5.ebuild 1096 BLAKE2B 9ecf38085edb6ab2a5a5117618892a1106a976cfc8735fe01ce8cba99168ce1aaf6656ec535b9429e988420f9194ed78d7f069ad7043a10d62d1d99de95f267b SHA512 eb842fd1d6908dbead8b360566d05a0b6a7818b7e28055faae20aae8dcfba3a4f835b080304b3f6d00007f7d2e0ce2b810ce528540732a9ccffc0c6f99afbaf7 MISC metadata.xml 350 BLAKE2B 179ce6945eeec3c78414fb6dd66822f26ac6b629528da5868b44d3715355ec80acb1cc5dd8357b659f31877c83bfc10ae8b236367904bbbdd36d2ec7c1458739 SHA512 64646993f5469b2573385aa94fa578ae0e7645f4c5a30b631cf1d0de9ac5ef88270ba85e95f684b884631ec21d7ef31c4d68b563923901651da2ec631b0ccff5 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 5ec153ddcd8c..ac43a88ac6fc 100644 --- a/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild +++ b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm64 ppc64 ~riscv x86" DEPEND="!gnustep-base/libobjc2" RDEPEND="${DEPEND}" @@ -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 new file mode 100644 index 000000000000..af88a1aec21c --- /dev/null +++ b/dev-libs/libdispatch/libdispatch-5.5.ebuild @@ -0,0 +1,53 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic cmake toolchain-funcs + +MY_PN="swift-corelibs-${PN}" +MY_PV="swift-${PV}-RELEASE" + +DESCRIPTION="A library for concurrent code execution on multicore hardware" +HOMEPAGE="https://github.com/apple/swift-corelibs-libdispatch" +SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + +DEPEND=" + !gnustep-base/libobjc2 + !sys-libs/blocksruntime +" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-devel/clang + sys-devel/llvm + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_PN}-${MY_PV}" + +PATCHES=( + "${FILESDIR}/remove-Werror.patch" + "${FILESDIR}/libdispatch-5.3.3-musl.patch" +) + +src_configure () { + if ! tc-is-clang ; then + AR=llvm-ar + CC=${CHOST}-clang + CXX=${CHOST}-clang++ + NM=llvm-nm + RANLIB=llvm-ranlib + + strip-unsupported-flags + fi + + export HOST_CC="$(tc-getBUILD_CC)" + export HOST_CXX="$(tc-getBUILD_CXX)" + tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG + + cmake_src_configure +} -- cgit v1.2.3