summaryrefslogtreecommitdiff
path: root/dev-cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/edencommon/Manifest4
-rw-r--r--dev-cpp/edencommon/edencommon-2022.08.29.00.ebuild41
-rw-r--r--dev-cpp/edencommon/edencommon-2023.05.01.00.ebuild41
-rw-r--r--dev-cpp/edencommon/edencommon-2023.05.22.00.ebuild2
-rw-r--r--dev-cpp/edencommon/edencommon-2023.06.19.00.ebuild (renamed from dev-cpp/edencommon/edencommon-2023.04.10.00.ebuild)0
-rw-r--r--dev-cpp/folly/Manifest4
-rw-r--r--dev-cpp/folly/files/folly-2023.06.19.00-fmt.patch62
-rw-r--r--dev-cpp/folly/folly-2022.08.29.00.ebuild100
-rw-r--r--dev-cpp/folly/folly-2023.04.10.00.ebuild110
-rw-r--r--dev-cpp/folly/folly-2023.05.22.00.ebuild4
-rw-r--r--dev-cpp/folly/folly-2023.06.19.00.ebuild (renamed from dev-cpp/folly/folly-2023.05.01.00.ebuild)41
11 files changed, 78 insertions, 331 deletions
diff --git a/dev-cpp/edencommon/Manifest b/dev-cpp/edencommon/Manifest
index c4d163ab50a2..3b5e22af9767 100644
--- a/dev-cpp/edencommon/Manifest
+++ b/dev-cpp/edencommon/Manifest
@@ -1,5 +1,3 @@
-DIST edencommon-2022.08.29.00.gh.tar.gz 143430 BLAKE2B a66bae35413097140b24c9313b12d55d52cbd98396ff1afacc751eb9752d4116ab19aeb9320dead5500189d74b4d91fdc09d9648fc6b5fbb55a706328488e7ef SHA512 6622c5de2dbff96717a345c82aaf9335745ed57262bb55c7a6704a68259ce81376ff0a2e9f3818ed1c1f08434da704f31fd4e3d8c48dd13646f0202e7564b2c7
DIST edencommon-2023.02.06.00.gh.tar.gz 144809 BLAKE2B bfde04282eff3ad745ed02708ba550e81c3d7916c634f01bc3fa9f2232953b4ccc8f319378636add4122cdf4c944212d7ecb649072c82f44dd8751640bc8f260 SHA512 c5763aa6a035febc6ce2a8b32c7ffb576b0a73448cf44e4a3788d87c45507a429065a02c37bce2165b2b51b3139cef51dc5ecd6cce203093f9043387b8912b15
-DIST edencommon-2023.04.10.00.gh.tar.gz 146594 BLAKE2B 8712de4a79d1f0d2fc2f9fb88c6ea262e5b9c849c96848a3ff0906085e0088a3d68efe12b7e4d7085c05f6909f06da5f3b40c54af522da21bd19a0b795aef06f SHA512 2f1c32b1940834f0b6e5cd104832f0a373cb417fd3e64e9e744c95b24361a3df5e540bf14a74be15a95b4c241cfec92c6185bc0bf11e1de927f729a3a9458ee8
-DIST edencommon-2023.05.01.00.gh.tar.gz 146608 BLAKE2B e6669f43baa4c52909e7e831636ee52e4aa438dbcca7f040220eb69eb7e832c8cb190be52c5ba7dbe3d6e3cf2ae35d02a0c52904096cbff41b96eef888f5f632 SHA512 39ec2234bd43dbfd666b8e066891f14b10ac50076ac97351a082d07a979c1bfbeb0036aaa30862dd055fa8cdf4c4b1b3b5a5416c3aec91796cc2be7a8986997e
DIST edencommon-2023.05.22.00.gh.tar.gz 146695 BLAKE2B 23003c0d9d5364d840ec8e286ec2512a28740df70480593086b2c969f4f785b3ff9000e074729fdaa561f3bd917ee204bd2719878996d606567f38fb50884149 SHA512 20b645250c41f1db95ae9950577f020a0c1240178411e3fcf7eb1219dd2bf0e3d7ceb0e98a17df7ba82259a52856d8001baea7ff8b1c178e22e7efb48b41587a
+DIST edencommon-2023.06.19.00.gh.tar.gz 146697 BLAKE2B 8b2419671c50eea43aa4b8d5d85eee75ed24ff9745a71c2d11b1994605552ffc288b55520639585631aed0e2528482a01daa9b47ef676fed7c14b4c7d75d018f SHA512 47b37a6acf93a6c6f2903f3113021aa1d54230cf3e31a8071aa7f276601a8eae56bd95767ec23c3027695367261d4db1483b637513c72ce220778f1f1a4c42ce
diff --git a/dev-cpp/edencommon/edencommon-2022.08.29.00.ebuild b/dev-cpp/edencommon/edencommon-2022.08.29.00.ebuild
deleted file mode 100644
index e824b8de7d92..000000000000
--- a/dev-cpp/edencommon/edencommon-2022.08.29.00.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022 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
-
-DESCRIPTION="Shared library for Watchman and Eden projects"
-HOMEPAGE="https://github.com/facebookexperimental/edencommon"
-SRC_URI="https://github.com/facebookexperimental/edencommon/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-IUSE="llvm-libunwind"
-
-RDEPEND="
- dev-cpp/gflags:=
- dev-cpp/glog:=[gflags]
- dev-cpp/folly:=
- llvm-libunwind? ( sys-libs/llvm-libunwind:= )
- !llvm-libunwind? ( sys-libs/libunwind:= )
-"
-DEPEND="
- ${RDEPEND}
- dev-cpp/gtest
-"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DIR="$(get_libdir)/cmake/${PN}"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake_src_configure
-}
diff --git a/dev-cpp/edencommon/edencommon-2023.05.01.00.ebuild b/dev-cpp/edencommon/edencommon-2023.05.01.00.ebuild
deleted file mode 100644
index 411e811b2905..000000000000
--- a/dev-cpp/edencommon/edencommon-2023.05.01.00.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022-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
-
-DESCRIPTION="Shared library for Watchman and Eden projects"
-HOMEPAGE="https://github.com/facebookexperimental/edencommon"
-SRC_URI="https://github.com/facebookexperimental/edencommon/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="llvm-libunwind"
-
-RDEPEND="
- dev-cpp/gflags:=
- dev-cpp/glog:=[gflags]
- dev-cpp/folly:=
- llvm-libunwind? ( sys-libs/llvm-libunwind:= )
- !llvm-libunwind? ( sys-libs/libunwind:= )
-"
-DEPEND="
- ${RDEPEND}
- dev-cpp/gtest
-"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DIR="$(get_libdir)/cmake/${PN}"
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
-
- cmake_src_configure
-}
diff --git a/dev-cpp/edencommon/edencommon-2023.05.22.00.ebuild b/dev-cpp/edencommon/edencommon-2023.05.22.00.ebuild
index 411e811b2905..1296800f7058 100644
--- a/dev-cpp/edencommon/edencommon-2023.05.22.00.ebuild
+++ b/dev-cpp/edencommon/edencommon-2023.05.22.00.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/facebookexperimental/edencommon/archive/refs/tags/v$
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="llvm-libunwind"
RDEPEND="
diff --git a/dev-cpp/edencommon/edencommon-2023.04.10.00.ebuild b/dev-cpp/edencommon/edencommon-2023.06.19.00.ebuild
index 411e811b2905..411e811b2905 100644
--- a/dev-cpp/edencommon/edencommon-2023.04.10.00.ebuild
+++ b/dev-cpp/edencommon/edencommon-2023.06.19.00.ebuild
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index 31655e07962d..0f7c876c562f 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -1,5 +1,3 @@
-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
+DIST folly-v2023.06.19.00.tar.gz 3850872 BLAKE2B 6332b6de28fd4a0c19b20c4b23fa7093bded940fb07de92ad9fa7f44b8347fb5e5543e5a57c32d2414f345b4f7b306eed806c5d48a871a06833c1d2a71a34584 SHA512 9189adddf59019787969c7edb27a3e57436c2dca772f3142cdbf66e3a69b398be7ae4f2c36a9576c7ad9c51fd3703555e2a7ad6ed1ddce4036f8760d8095d371
diff --git a/dev-cpp/folly/files/folly-2023.06.19.00-fmt.patch b/dev-cpp/folly/files/folly-2023.06.19.00-fmt.patch
new file mode 100644
index 000000000000..80e4a2fbf80a
--- /dev/null
+++ b/dev-cpp/folly/files/folly-2023.06.19.00-fmt.patch
@@ -0,0 +1,62 @@
+https://github.com/facebook/folly/commit/a65b35c03797c86969a7b0d9ec281935a21cfa18
+https://github.com/facebook/folly/pull/2022
+
+From a65b35c03797c86969a7b0d9ec281935a21cfa18 Mon Sep 17 00:00:00 2001
+From: Giuseppe Ottaviano <ott@meta.com>
+Date: Sun, 18 Jun 2023 00:40:43 -0700
+Subject: [PATCH] fmt/core.h is enough in Core.cpp
+
+Reviewed By: Orvid, luciang
+
+Differential Revision: D46788525
+
+fbshipit-source-id: 03da65f3499ca56b34baa4e75b2340bea36690f6
+---
+ folly/futures/detail/Core.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/folly/futures/detail/Core.cpp b/folly/futures/detail/Core.cpp
+index 26bd4afbffe..858229100f9 100644
+--- a/folly/futures/detail/Core.cpp
++++ b/folly/futures/detail/Core.cpp
+@@ -18,7 +18,7 @@
+
+ #include <new>
+
+-#include <fmt/format.h>
++#include <fmt/core.h>
+ #include <folly/lang/Assume.h>
+
+ namespace folly {
+
+From d783a64391c02b40d78dfc6be04932fa45c46b9a Mon Sep 17 00:00:00 2001
+From: Marcus Holland-Moritz <github@mhxnet.de>
+Date: Tue, 20 Jun 2023 11:59:42 +0200
+Subject: [PATCH] Fix libfmt errors from not finding enum formatter
+
+Recent versions of libfmt have become more strict and require
+`enum` types to be formattable:
+
+ static assertion failed due to requirement 'formattable': Cannot format an argument. To make type T formattable provide a formatter<T> specialization: https://fmt.dev/latest/api.html#udt
+
+This is a quick fix to simply use the underlying type.
+--- a/folly/futures/detail/Core.cpp
++++ b/folly/futures/detail/Core.cpp
+@@ -19,6 +19,7 @@
+ #include <new>
+
+ #include <fmt/core.h>
++#include <folly/Utility.h>
+ #include <folly/lang/Assume.h>
+
+ namespace folly {
+@@ -30,7 +31,7 @@ namespace {
+ template <class Enum>
+ void terminate_unexpected_state(fmt::string_view context, Enum state) {
+ terminate_with<std::logic_error>(
+- fmt::format("{} unexpected state: {}", context, state));
++ fmt::format("{} unexpected state: {}", context, to_underlying(state)));
+ }
+
+ } // namespace
+
diff --git a/dev-cpp/folly/folly-2022.08.29.00.ebuild b/dev-cpp/folly/folly-2022.08.29.00.ebuild
deleted file mode 100644
index 6b0a91913e9c..000000000000
--- a/dev-cpp/folly/folly-2022.08.29.00.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 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
-)
-
-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
- -E "(timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest.HHWheelTimerTest.CancelTimeout)"
- )
-
- cmake_src_test
-}
diff --git a/dev-cpp/folly/folly-2023.04.10.00.ebuild b/dev-cpp/folly/folly-2023.04.10.00.ebuild
deleted file mode 100644
index 77a442688377..000000000000
--- a/dev-cpp/folly/folly-2023.04.10.00.ebuild
+++ /dev/null
@@ -1,110 +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"
-
-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 )"
-BDEPEND="test? ( sys-devel/clang )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2022.07.04.00-musl-fix.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_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
-}
diff --git a/dev-cpp/folly/folly-2023.05.22.00.ebuild b/dev-cpp/folly/folly-2023.05.22.00.ebuild
index 08296dbb6784..11d6692f182c 100644
--- a/dev-cpp/folly/folly-2023.05.22.00.ebuild
+++ b/dev-cpp/folly/folly-2023.05.22.00.ebuild
@@ -8,7 +8,7 @@ EAPI=8
# dev-cpp/folly
# dev-util/watchman
-inherit cmake toolchain-funcs
+inherit cmake
DESCRIPTION="An open-source C++ library developed and used at Facebook"
HOMEPAGE="https://github.com/facebook/folly"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/facebook/folly/releases/download/v${PV}/${PN}-v${PV}
LICENSE="Apache-2.0"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
IUSE="llvm-libunwind test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/folly/folly-2023.05.01.00.ebuild b/dev-cpp/folly/folly-2023.06.19.00.ebuild
index 77a442688377..48db76046492 100644
--- a/dev-cpp/folly/folly-2023.05.01.00.ebuild
+++ b/dev-cpp/folly/folly-2023.06.19.00.ebuild
@@ -8,7 +8,7 @@ EAPI=8
# dev-cpp/folly
# dev-util/watchman
-inherit cmake toolchain-funcs
+inherit cmake
DESCRIPTION="An open-source C++ library developed and used at Facebook"
HOMEPAGE="https://github.com/facebook/folly"
@@ -20,7 +20,8 @@ KEYWORDS="~amd64 ~ppc64"
IUSE="llvm-libunwind test"
RESTRICT="!test? ( test )"
-RDEPEND="app-arch/bzip2
+RDEPEND="
+ app-arch/bzip2
app-arch/lz4:=
app-arch/snappy:=
app-arch/xz-utils
@@ -37,40 +38,20 @@ RDEPEND="app-arch/bzip2
>=sys-libs/liburing-2.3:=
sys-libs/zlib
llvm-libunwind? ( sys-libs/llvm-libunwind:= )
- !llvm-libunwind? ( sys-libs/libunwind:= )"
+ !llvm-libunwind? ( sys-libs/libunwind:= )
+"
# libiberty is linked statically
-DEPEND="${RDEPEND}
+DEPEND="
+ ${RDEPEND}
sys-libs/binutils-libs
- test? ( dev-cpp/gtest )"
-BDEPEND="test? ( sys-devel/clang )"
+ test? ( dev-cpp/gtest )
+"
PATCHES=(
- "${FILESDIR}"/${PN}-2022.07.04.00-musl-fix.patch
+ "${FILESDIR}"/${PN}-2023.05.22.00-musl-fix.patch
+ "${FILESDIR}"/${PN}-2023.06.19.00-fmt.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_unpack() {
# Workaround for bug #889420
mkdir -p "${S}" || die
generated by cgit v1.3 (git 2.53.0) at 2026-10-16 10:10:33 +0000