From 27c1d146e5ee9e472a31a7958ad4dc70a5451ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Jun 2023 15:29:04 +0100 Subject: gentoo auto-resync : 02:06:2023 - 15:29:04 --- dev-cpp/folly/Manifest | 3 + .../folly/files/folly-2023.05.22.00-musl-fix.patch | 26 +++++++ dev-cpp/folly/folly-2023.05.22.00.ebuild | 90 ++++++++++++++++++++++ 3 files changed, 119 insertions(+) create mode 100644 dev-cpp/folly/files/folly-2023.05.22.00-musl-fix.patch create mode 100644 dev-cpp/folly/folly-2023.05.22.00.ebuild (limited to 'dev-cpp/folly') diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest index cb0ecc648541..1c107606c082 100644 --- a/dev-cpp/folly/Manifest +++ b/dev-cpp/folly/Manifest @@ -1,10 +1,13 @@ AUX folly-2022.07.04.00-musl-fix.patch 1150 BLAKE2B 6774badf3856fa94ae69dc4ca3fb3aca628dcf3b96fd7d141967815a9a07c07349f852a35275baba7b91d60e0c61dc3e1639cab4727666fa128d0334f36815a2 SHA512 15029e25b4da1f9cfe227978a54f63c198361df665b4657ef6a80ffdd3911c80be8e6c3799c8c16ff0fcca050932155628651a6e5ed566a41174dced9e51dc58 +AUX folly-2023.05.22.00-musl-fix.patch 895 BLAKE2B 72f3dde91fa7eabdc08c3375e660f31beb833835decc129570667984d973d8a71db37cdef3aaca28375a64e6afbd04df0849fc47798d7982556a84a028e034f4 SHA512 afdaa0edd233f21693b947d30d549ed13a8871bf49e05be97d8d86015452d85769c2e46929f5cce14c3cff8eb7000431638ee0c8fc3f97b0765a4b3aea3b20b9 DIST folly-v2022.08.29.00.tar.gz 3696645 BLAKE2B c1ff618be8b6a73bf0a1249212cf904ac472711086e54da73dd631ecf002761e30496e8631d6591f51e279b736ae9b3fe50959de6b1f86f01f9d6bc08fe675fc SHA512 1437a1314e26624715a0bb781049e19300eb3a67648287b319c55ce0dfbc867a09bd9d2f0cece6fc75fc62b21899aa94b464ae49c12687be7c94fdf0c7b95790 DIST folly-v2023.02.06.00.tar.gz 3790845 BLAKE2B b1c0eed7a2dccba3ccb5e25aa24cc0a6d628fbc3134bf0ed82a1e0e614825a3ae620d79a54e2bea398274afcb662bdfca48d7193f69db35f624ed6a2fa9bae99 SHA512 b9cd8132a702e88e4c9fefcce190d9fd403253c9b71dc22316f237922d99f9cd980ab81d50ddb48ae0e614a493b3d61865b03eee46d59805f83fce528f831646 DIST folly-v2023.04.10.00.tar.gz 3816300 BLAKE2B fe262148583321ee55da9305a9e060e48915598c08edbd0edb884529d0a9547783f2e1a45b0f39e461ea6b92e9c0b74fc7b071ec1ed044b810ac2065c93a5f10 SHA512 4f154127f24e2e57873ed8e135989c214ae3bbaf0302594b3e67de89e04bf4905f45471a488220ecade56b9ae2b928a779b66f7632210a02b1087a4c05141d5a DIST folly-v2023.05.01.00.tar.gz 3821115 BLAKE2B 6b2e14dd7b88daa5f81294143f0ad62dc119d7f20f4e4a48859213997cf67df9840a46b7933cd806af166394de1981b0a9f2d9f194e2cb54c73eed8e60c3ed04 SHA512 92bea2e7449a85936a93aef8a216e83f402be41bbd9ab4e90759600bb40e7903e4c8e490cadcf40f098c7a69e187db4d1062645fba8ef15764ba753276ada535 +DIST folly-v2023.05.22.00.tar.gz 3834791 BLAKE2B e981f844b12620b274a78fa6640d1510525c1b4cc3bb35594bd5c5daf238eb19291a1ddf19f29e26269effbe79c22ccc9c002f5f547e06566aa804f0d92a0a9c SHA512 4af93f23a6835efaca317dc7a15abe13619d498efbaa5b349a30682be35c129bd87ab9723c5186e63e3d3b646a80816b994f5237108f8d489a50a028bb16c9da EBUILD folly-2022.08.29.00.ebuild 2474 BLAKE2B ba8b143ee679b37e2facd8ac30f6eee6ca8fd2606c5731757f2a2b5d6f6a9ce655d97f97317c907c5452e0e6494e81ee1dee376d97c708cc950b9e1e6090853d SHA512 81b7baddf458a0d394e158671f71f613fc7b760aea065b5ce7ab26856bdae9303462ac770b6dd067bf49f63fc776fdae4a66c9437cd9de009a2e716969e044f1 EBUILD folly-2023.02.06.00.ebuild 2690 BLAKE2B 589a40f4a2fe368b18be4ea70797cf6eea3b6727b4efad54d355db9d67502cd939198d11f13d5c513c4e228d9ea3b39bd5671cd823af1dd5a0c2827c791eb4f2 SHA512 efa4c04142de56766c4e6beb227b00839e1f6bc3e8df6b4f27ff487521f0676e7164775f7a6e77c93a6ed14fe23009abcd525557e2a4bb29fa135373a2ab2fa3 EBUILD folly-2023.04.10.00.ebuild 2822 BLAKE2B fa3df4771db2609c819bc25f63999bd46162b65887aacb713ec4d009ba8b93c332fa1c5d0138e57d8a7bbee302c383fa2f0f32784a59afabdfc0660d7a2328ea SHA512 d82f58b20eecc0420fba647575d2822f0e13ec5b33cf8a72db5a459ad8e7131f4255136229331c21338015109eb99000d4711b6fc145b6309d16db719167ca65 EBUILD folly-2023.05.01.00.ebuild 2822 BLAKE2B fa3df4771db2609c819bc25f63999bd46162b65887aacb713ec4d009ba8b93c332fa1c5d0138e57d8a7bbee302c383fa2f0f32784a59afabdfc0660d7a2328ea SHA512 d82f58b20eecc0420fba647575d2822f0e13ec5b33cf8a72db5a459ad8e7131f4255136229331c21338015109eb99000d4711b6fc145b6309d16db719167ca65 +EBUILD folly-2023.05.22.00.ebuild 2159 BLAKE2B 3d0e07df3f6bd8f6ed0fdfe9c4eb03eed6fa13081491b5e01427d356ca3e9d84a6a764272185820da275f9386d254ee44b60bdb00c1ffcc83c3f8ee339b5f19c SHA512 9ef6005423f1c9d2e847e479c487518aa16be92c64009af52648d2a657620744eb79a1024f42a0699a8e7b190fa7ca077b0a86bd3f0f866edd99bd28a5f63bbd MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027 diff --git a/dev-cpp/folly/files/folly-2023.05.22.00-musl-fix.patch b/dev-cpp/folly/files/folly-2023.05.22.00-musl-fix.patch new file mode 100644 index 000000000000..6f92db0a785a --- /dev/null +++ b/dev-cpp/folly/files/folly-2023.05.22.00-musl-fix.patch @@ -0,0 +1,26 @@ +# Elf.cpp expects __ELF_NATIVE_CLASS to be defined at least for platforms +# besides FreeBSD-based ones, and so it defines FOLLY_ELF_NATIVE_CLASS with it. +# Without __ELF_NATIVE_CLASS (and apparently musl does not define it), +# FOLLY_ELF_NATIVE_CLASS is also not defined so what was supposed to be +# expanded to ELFCLASS32 or ELFCLASS64 ends up being +# ELFCLASSFOLLY_ELF_NATIVE_CLASS. +# +# Please refer: https://github.com/facebook/folly/issues/1478 +# +# Closes: https://bugs.gentoo.org/835744 +--- a/folly/experimental/symbolizer/Elf.cpp ++++ b/folly/experimental/symbolizer/Elf.cpp +@@ -39,12 +39,10 @@ + + #if defined(__ELF_NATIVE_CLASS) + #define FOLLY_ELF_NATIVE_CLASS __ELF_NATIVE_CLASS +-#elif defined(__FreeBSD__) +-#if defined(__LP64__) ++#elif defined(__LP64__) + #define FOLLY_ELF_NATIVE_CLASS 64 + #else + #define FOLLY_ELF_NATIVE_CLASS 32 +-#endif + #endif // __ELF_NATIVE_CLASS + + namespace folly { diff --git a/dev-cpp/folly/folly-2023.05.22.00.ebuild b/dev-cpp/folly/folly-2023.05.22.00.ebuild new file mode 100644 index 000000000000..08296dbb6784 --- /dev/null +++ b/dev-cpp/folly/folly-2023.05.22.00.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# These must be bumped together: +# dev-cpp/edencommon +# dev-cpp/folly +# dev-util/watchman + +inherit cmake toolchain-funcs + +DESCRIPTION="An open-source C++ library developed and used at Facebook" +HOMEPAGE="https://github.com/facebook/folly" +SRC_URI="https://github.com/facebook/folly/releases/download/v${PV}/${PN}-v${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc64" +IUSE="llvm-libunwind test" +RESTRICT="!test? ( test )" + +RDEPEND=" + app-arch/bzip2 + app-arch/lz4:= + app-arch/snappy:= + app-arch/xz-utils + app-arch/zstd:= + dev-cpp/gflags:= + dev-cpp/glog:=[gflags] + dev-libs/boost:=[context] + dev-libs/double-conversion:= + dev-libs/libaio + dev-libs/libevent:= + dev-libs/libfmt:= + dev-libs/libsodium:= + dev-libs/openssl:= + >=sys-libs/liburing-2.3:= + sys-libs/zlib + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) +" +# libiberty is linked statically +DEPEND=" + ${RDEPEND} + sys-libs/binutils-libs + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2023.05.22.00-musl-fix.patch +) + +src_unpack() { + # Workaround for bug #889420 + mkdir -p "${S}" || die + cd "${S}" || die + default +} + +src_configure() { + # TODO: liburing could in theory be optional but fails to link + local mycmakeargs=( + -DLIB_INSTALL_DIR="$(get_libdir)" + + -DBUILD_TESTS=$(usex test) + + # https://github.com/gentoo/gentoo/pull/29393 + -DCMAKE_LIBRARY_ARCHITECTURE=$(usex amd64 x86_64 ${ARCH}) + ) + + cmake_src_configure +} + +src_test() { + local myctestargs=( + # - timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest + # Long-standing known test failure + # TODO: report upstream + # - HHWheelTimerTest.HHWheelTimerTest.CancelTimeout + # Timeouts are fragile + # - concurrent_hash_map_test.* + # TODO: All SIGSEGV, report upstream! + # - ssl_errors_test.SSLErrorsTest.TestMessage + # Network...? + -E "(timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest.HHWheelTimerTest.CancelTimeout|concurrent_hash_map_test.*|ssl_errors_test.SSLErrorsTest.TestMessage)" + ) + + cmake_src_test +} -- cgit v1.2.3