From a2014cddc474ddf247d63fa74aac9a182a2bcefc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 24 Jan 2023 00:56:11 +0000 Subject: gentoo auto-resync : 24:01:2023 - 00:56:11 --- dev-cpp/folly/Manifest | 2 +- dev-cpp/folly/folly-2023.01.16.00-r1.ebuild | 104 ++++++++++++++++++++++++++++ dev-cpp/folly/folly-2023.01.16.00.ebuild | 104 ---------------------------- 3 files changed, 105 insertions(+), 105 deletions(-) create mode 100644 dev-cpp/folly/folly-2023.01.16.00-r1.ebuild delete mode 100644 dev-cpp/folly/folly-2023.01.16.00.ebuild (limited to 'dev-cpp/folly') diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest index 97f8b1f8ca74..bc8535005e09 100644 --- a/dev-cpp/folly/Manifest +++ b/dev-cpp/folly/Manifest @@ -6,5 +6,5 @@ DIST folly-v2022.09.12.00.tar.gz 3710760 BLAKE2B af59580ebee3229a6564c4b29e1d24b DIST folly-v2023.01.16.00.tar.gz 3774935 BLAKE2B e6c5925de0e571d83ac6db363a92f3d8c2fa7e911efc3db8f41b702dacd64aed5247313102ca12ca36a27a6fd8d8d5168ca8e98835f4000b425c10560a39e392 SHA512 941e09c90fab9e668d5f6b77f22caeff1da4347324c017ad64359748e18fc7c713d13f839d90a116164005041824c8a8d2039cfcc7687e23d9be8fa5acbd61ec EBUILD folly-2022.08.29.00.ebuild 2474 BLAKE2B ba8b143ee679b37e2facd8ac30f6eee6ca8fd2606c5731757f2a2b5d6f6a9ce655d97f97317c907c5452e0e6494e81ee1dee376d97c708cc950b9e1e6090853d SHA512 81b7baddf458a0d394e158671f71f613fc7b760aea065b5ce7ab26856bdae9303462ac770b6dd067bf49f63fc776fdae4a66c9437cd9de009a2e716969e044f1 EBUILD folly-2022.09.12.00.ebuild 2475 BLAKE2B 04744830b870ccbe5cacc9108fa169f34da17ce6a05c9c795d8533d8e309ce60020084ac5d0e1c0e48e7ea28bdd2fae79facf59630737b2f36dfe90eccf758fe SHA512 0c86667f9d75ad4b6e7b9f70d376343616f9f780cfa94bf6cf82624bda963f0e1600beefbafc88357bfbf35eaaaf10eb1e8e4a287eef3eff06190e1fb0dcbf70 -EBUILD folly-2023.01.16.00.ebuild 2657 BLAKE2B 07eb73233fb72de09af512a571774001ce1d9a92408c7afe8abfe4b3aad6fa1c35a8d4e2385b7aeed1ae8ee8137aa12040f6a101ec34fb2bc0016f99b61bb79f SHA512 de2ef3fda675b660dc578693a872ee179bbb0858f10b64c350035c53901571c30292eca6ef4fecc93384844824869da35102ecf19410784b93692917991eabe4 +EBUILD folly-2023.01.16.00-r1.ebuild 2657 BLAKE2B e3cb7fe971ab44af5e3d28c8b0075e92f2804092dfd8ac3df3749b4a93e79821cac3872250828e7235b46aa9e489c9be16580e500c6f73fafaa5f19ef88588d2 SHA512 0f3e5de47fdbb8d613adbc9d9b4ee60c010281f11c322fe0a5eb6ac0aa43701f084f8d6d7ddc9482aefb1f0aa89cd2fede7240eac50853f86a9eb2f375492afb MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027 diff --git a/dev-cpp/folly/folly-2023.01.16.00-r1.ebuild b/dev-cpp/folly/folly-2023.01.16.00-r1.ebuild new file mode 100644 index 000000000000..6c6ee5cfd970 --- /dev/null +++ b/dev-cpp/folly/folly-2023.01.16.00-r1.ebuild @@ -0,0 +1,104 @@ +# 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" +S="${WORKDIR}" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64" +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 )" +BDEPEND="test? ( sys-devel/clang )" + +PATCHES=( + "${FILESDIR}"/${PN}-2022.07.04.00-musl-fix.patch + "${FILESDIR}"/${PN}-2023.01.16.00-gcc13.patch + "${FILESDIR}"/${P}-liburing.patch +) + +pkg_setup() { + [[ ${BUILD_TYPE} == binary ]] && return + + if use test && ! tc-is-clang ; then + # Always build w/ Clang for now to avoid gcc ICE + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106230 + #if [[ $(gcc-major-version) -eq 12 ]] ; then + # return + #fi + + ## Only older GCC 11 is broken + #if [[ $(gcc-major-version) -eq 11 && $(gcc-minor-version) -ge 3 && $(gcc-micro-version) -ge 1 ]] ; then + # return + #fi + + ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)" + #ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)" + + export CC=${CHOST}-clang + export CXX=${CHOST}-clang++ + fi +} + +src_configure() { + # Fragile when changing compilers + export CCACHE_DISABLE=1 + + # TODO: liburing could in theory be optional but fails to link + local mycmakeargs=( + -DLIB_INSTALL_DIR="$(get_libdir)" + + -DBUILD_TESTS=$(usex test) + ) + + 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! + -E "(timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest.HHWheelTimerTest.CancelTimeout|concurrent_hash_map_test.*)" + ) + + cmake_src_test +} diff --git a/dev-cpp/folly/folly-2023.01.16.00.ebuild b/dev-cpp/folly/folly-2023.01.16.00.ebuild deleted file mode 100644 index c8873dfdd4ee..000000000000 --- a/dev-cpp/folly/folly-2023.01.16.00.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# 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" -S="${WORKDIR}" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -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.2:= - 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 )" -BDEPEND="test? ( sys-devel/clang )" - -PATCHES=( - "${FILESDIR}"/${PN}-2022.07.04.00-musl-fix.patch - "${FILESDIR}"/${PN}-2023.01.16.00-gcc13.patch - "${FILESDIR}"/${P}-liburing.patch -) - -pkg_setup() { - [[ ${BUILD_TYPE} == binary ]] && return - - if use test && ! tc-is-clang ; then - # Always build w/ Clang for now to avoid gcc ICE - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106230 - #if [[ $(gcc-major-version) -eq 12 ]] ; then - # return - #fi - - ## Only older GCC 11 is broken - #if [[ $(gcc-major-version) -eq 11 && $(gcc-minor-version) -ge 3 && $(gcc-micro-version) -ge 1 ]] ; then - # return - #fi - - ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)" - #ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)" - - export CC=${CHOST}-clang - export CXX=${CHOST}-clang++ - fi -} - -src_configure() { - # Fragile when changing compilers - export CCACHE_DISABLE=1 - - # TODO: liburing could in theory be optional but fails to link - local mycmakeargs=( - -DLIB_INSTALL_DIR="$(get_libdir)" - - -DBUILD_TESTS=$(usex test) - ) - - 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! - -E "(timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest.HHWheelTimerTest.CancelTimeout|concurrent_hash_map_test.*)" - ) - - cmake_src_test -} -- cgit v1.2.3