From 864ccd3aba62b24728eb0b963d8a1093555475c0 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Wed, 5 Nov 2025 19:02:56 +0000 Subject: Adding metadata --- dev-cpp/cpp-utilities/Manifest | 1 + dev-cpp/cpp-utilities/cpp-utilities-5.31.0.ebuild | 23 ++++++++++ dev-cpp/cpp-utilities/metadata.xml | 10 +++++ dev-cpp/fbthrift/fbthrift-2024.11.04.00-r1.ebuild | 2 +- dev-cpp/fbthrift/fbthrift-2025.04.14.00-r2.ebuild | 2 +- dev-cpp/fizz/fizz-2025.04.14.00.ebuild | 2 +- dev-cpp/folly/folly-2023.06.19.00-r1.ebuild | 4 +- dev-cpp/folly/folly-2024.11.04.00-r2.ebuild | 2 +- dev-cpp/folly/folly-2025.04.14.00-r1.ebuild | 2 +- dev-cpp/folly/folly-2025.04.14.00-r2.ebuild | 2 +- dev-cpp/glaze/glaze-5.5.4.ebuild | 2 +- dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild | 4 +- dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild | 4 +- dev-cpp/msgpack-cxx/msgpack-cxx-6.1.0.ebuild | 4 +- dev-cpp/msgpack-cxx/msgpack-cxx-6.1.1.ebuild | 2 +- .../opentelemetry-cpp-1.22.0.ebuild | 2 +- dev-cpp/prometheus-cpp/prometheus-cpp-1.2.4.ebuild | 2 +- dev-cpp/robin-map/robin-map-1.4.0-r1.ebuild | 2 +- dev-cpp/tbb/Manifest | 2 +- .../files/tbb-2022.3.0-no-clobber-hardened.patch | 37 +++++++++++++++ dev-cpp/tbb/tbb-2022.2.0.ebuild | 51 --------------------- dev-cpp/tbb/tbb-2022.3.0.ebuild | 52 ++++++++++++++++++++++ 22 files changed, 143 insertions(+), 71 deletions(-) create mode 100644 dev-cpp/cpp-utilities/Manifest create mode 100644 dev-cpp/cpp-utilities/cpp-utilities-5.31.0.ebuild create mode 100644 dev-cpp/cpp-utilities/metadata.xml create mode 100644 dev-cpp/tbb/files/tbb-2022.3.0-no-clobber-hardened.patch delete mode 100644 dev-cpp/tbb/tbb-2022.2.0.ebuild create mode 100644 dev-cpp/tbb/tbb-2022.3.0.ebuild (limited to 'dev-cpp') diff --git a/dev-cpp/cpp-utilities/Manifest b/dev-cpp/cpp-utilities/Manifest new file mode 100644 index 000000000000..d62ed5cbf2e6 --- /dev/null +++ b/dev-cpp/cpp-utilities/Manifest @@ -0,0 +1 @@ +DIST cpp-utilities-5.31.0.tar.gz 213089 BLAKE2B 3b35ed559ae8e15ec9a92719bdbdb0affb6d7b4bd01b9558042f51e2e5dce757fb819d08ae5ae7b38783a6461c08da249c9bc0daecd393da84d8a598f6df380e SHA512 1d1b294e9df060fa2332f877378d8865e8f84467901783f0e3839ae37578426c71a00ebcd42b9b628e38c46dbb20a99f04d9c3304a8f0cb627264a479a9b22e7 diff --git a/dev-cpp/cpp-utilities/cpp-utilities-5.31.0.ebuild b/dev-cpp/cpp-utilities/cpp-utilities-5.31.0.ebuild new file mode 100644 index 000000000000..9034ccc29e13 --- /dev/null +++ b/dev-cpp/cpp-utilities/cpp-utilities-5.31.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake + +DESCRIPTION="Useful C++ classes and routines" +HOMEPAGE="https://github.com/Martchus/cpp-utilities" + +SRC_URI="https://github.com/Martchus/cpp-utilities/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +src_configure() { + local mycmakeargs=( + -DEXCLUDE_TESTS_FROM_ALL=$(usex !test) + ) + cmake_src_configure +} diff --git a/dev-cpp/cpp-utilities/metadata.xml b/dev-cpp/cpp-utilities/metadata.xml new file mode 100644 index 000000000000..c41c001b8ca0 --- /dev/null +++ b/dev-cpp/cpp-utilities/metadata.xml @@ -0,0 +1,10 @@ + + + + + esteve.varela@gmail.com + Esteve Varela Colominas + + + gentoo-guru-overlay + \ No newline at end of file diff --git a/dev-cpp/fbthrift/fbthrift-2024.11.04.00-r1.ebuild b/dev-cpp/fbthrift/fbthrift-2024.11.04.00-r1.ebuild index e80ab350ff21..b47a838f5a4f 100644 --- a/dev-cpp/fbthrift/fbthrift-2024.11.04.00-r1.ebuild +++ b/dev-cpp/fbthrift/fbthrift-2024.11.04.00-r1.ebuild @@ -40,7 +40,7 @@ DEPEND=" dev-libs/libfmt:= dev-libs/openssl:= dev-libs/xxhash:= - sys-libs/zlib:= + virtual/zlib:= " RDEPEND=" ${DEPEND} diff --git a/dev-cpp/fbthrift/fbthrift-2025.04.14.00-r2.ebuild b/dev-cpp/fbthrift/fbthrift-2025.04.14.00-r2.ebuild index f068080311b4..993e2ce18db8 100644 --- a/dev-cpp/fbthrift/fbthrift-2025.04.14.00-r2.ebuild +++ b/dev-cpp/fbthrift/fbthrift-2025.04.14.00-r2.ebuild @@ -39,7 +39,7 @@ DEPEND=" dev-libs/libfmt:= dev-libs/openssl:= dev-libs/xxhash - sys-libs/zlib:= + virtual/zlib:= " RDEPEND=" ${DEPEND} diff --git a/dev-cpp/fizz/fizz-2025.04.14.00.ebuild b/dev-cpp/fizz/fizz-2025.04.14.00.ebuild index 3debe0b5d7a4..70a07e17db6d 100644 --- a/dev-cpp/fizz/fizz-2025.04.14.00.ebuild +++ b/dev-cpp/fizz/fizz-2025.04.14.00.ebuild @@ -39,7 +39,7 @@ RDEPEND=" dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/openssl:= - sys-libs/zlib + virtual/zlib:= " uEPEND=" ${RDEPEND} diff --git a/dev-cpp/folly/folly-2023.06.19.00-r1.ebuild b/dev-cpp/folly/folly-2023.06.19.00-r1.ebuild index 0257d178791a..777723a3e707 100644 --- a/dev-cpp/folly/folly-2023.06.19.00-r1.ebuild +++ b/dev-cpp/folly/folly-2023.06.19.00-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -36,7 +36,7 @@ RDEPEND=" dev-libs/libsodium:= dev-libs/openssl:= >=sys-libs/liburing-2.3:= - sys-libs/zlib + virtual/zlib:= llvm-libunwind? ( llvm-runtimes/libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) " diff --git a/dev-cpp/folly/folly-2024.11.04.00-r2.ebuild b/dev-cpp/folly/folly-2024.11.04.00-r2.ebuild index 9cbed7021ae2..6c715c7b5636 100644 --- a/dev-cpp/folly/folly-2024.11.04.00-r2.ebuild +++ b/dev-cpp/folly/folly-2024.11.04.00-r2.ebuild @@ -42,7 +42,7 @@ RDEPEND=" dev-libs/libsodium:= dev-libs/openssl:= >=sys-libs/liburing-2.3:= - sys-libs/zlib + virtual/zlib:= llvm-libunwind? ( llvm-runtimes/libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) " diff --git a/dev-cpp/folly/folly-2025.04.14.00-r1.ebuild b/dev-cpp/folly/folly-2025.04.14.00-r1.ebuild index c3bbe87a20b7..c80379393b45 100644 --- a/dev-cpp/folly/folly-2025.04.14.00-r1.ebuild +++ b/dev-cpp/folly/folly-2025.04.14.00-r1.ebuild @@ -41,7 +41,7 @@ RDEPEND=" dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/openssl:= - sys-libs/zlib + virtual/zlib:= llvm-libunwind? ( llvm-runtimes/libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) io-uring? ( >=sys-libs/liburing-2.10:= ) diff --git a/dev-cpp/folly/folly-2025.04.14.00-r2.ebuild b/dev-cpp/folly/folly-2025.04.14.00-r2.ebuild index 440014760b5a..b4e0eb1d05a5 100644 --- a/dev-cpp/folly/folly-2025.04.14.00-r2.ebuild +++ b/dev-cpp/folly/folly-2025.04.14.00-r2.ebuild @@ -41,7 +41,7 @@ RDEPEND=" dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/openssl:= - sys-libs/zlib + virtual/zlib:= llvm-libunwind? ( llvm-runtimes/libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) io-uring? ( >=sys-libs/liburing-2.10:= ) diff --git a/dev-cpp/glaze/glaze-5.5.4.ebuild b/dev-cpp/glaze/glaze-5.5.4.ebuild index cbeff4ec69d1..7a38952ed260 100644 --- a/dev-cpp/glaze/glaze-5.5.4.ebuild +++ b/dev-cpp/glaze/glaze-5.5.4.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/glaze-${PV}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="examples fuzzing test" RESTRICT="!test? ( test )" diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild index caf19cd7e8f6..e5e33b3bb52d 100644 --- a/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild +++ b/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ RDEPEND="boost? ( dev-libs/boost[context] ) !>:-fstack-protector-strong>) +- +-if (NOT APPLE AND NOT ANDROID_PLATFORM AND CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)") +- set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} -fstack-clash-protection $<$>:-fcf-protection=full>) +-endif() ++set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security -fPIC) + + # -z switch is not supported on MacOS + if (NOT APPLE) +- set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now,-z,noexecstack) ++ set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,noexecstack) + endif() + + set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS}) +--- a/cmake/compilers/GNU.cmake ++++ b/cmake/compilers/GNU.cmake +@@ -121,12 +121,7 @@ endif () + + # Gnu flags to prevent compiler from optimizing out security checks + set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -fno-strict-overflow -fno-delete-null-pointer-checks -fwrapv) +-set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security +- -fstack-protector-strong ) +-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)" AND NOT EMSCRIPTEN) +- set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} $<$>:-fcf-protection=full>) +-endif () +-set(TBB_LIB_COMPILE_FLAGS ${TBB_LIB_COMPILE_FLAGS} $<$>:-fstack-clash-protection>) ++set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-security -Werror=format-security) + + # -z switch is not supported on MacOS and MinGW + if (NOT APPLE AND NOT MINGW) diff --git a/dev-cpp/tbb/tbb-2022.2.0.ebuild b/dev-cpp/tbb/tbb-2022.2.0.ebuild deleted file mode 100644 index edfcdf42ad9a..000000000000 --- a/dev-cpp/tbb/tbb-2022.2.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -DESCRIPTION="High level abstract threading library" -HOMEPAGE="https://github.com/uxlfoundation/oneTBB" -SRC_URI="https://github.com/uxlfoundation/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/oneTBB-${PV}" - -LICENSE="Apache-2.0" -# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53 -# libtbb-libtbbmalloc-libtbbbind -SLOT="0/12.15-2.15-3.15" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch - "${FILESDIR}"/${PN}-2022.0.0_do-not-fortify-source.patch -) - -src_prepare() { - # Has an #error to force compilation as C but links with C++ library, dies - # with GLIBCXX_ASSERTIONS as a result. - sed -i -e '/tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c DEPENDENCIES TBB::tbbmalloc)/d' \ - test/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # Workaround for bug #912210 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - local mycmakeargs=( - -DTBB_TEST=$(usex test) - -DTBB_EXAMPLES=OFF # TODO: add this - -DTBB_ENABLE_IPO=OFF - -DTBB_STRICT=OFF - ) - - cmake-multilib_src_configure -} diff --git a/dev-cpp/tbb/tbb-2022.3.0.ebuild b/dev-cpp/tbb/tbb-2022.3.0.ebuild new file mode 100644 index 000000000000..e1263b783771 --- /dev/null +++ b/dev-cpp/tbb/tbb-2022.3.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic + +DESCRIPTION="High level abstract threading library" +HOMEPAGE="https://github.com/uxlfoundation/oneTBB" +SRC_URI="https://github.com/uxlfoundation/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/oneTBB-${PV}" + +LICENSE="Apache-2.0" +# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53 +# libtbb-libtbbmalloc-libtbbbind +SLOT="0/12.15-2.15-3.15" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch + "${FILESDIR}"/${PN}-2022.0.0_do-not-fortify-source.patch + "${FILESDIR}"/${PN}-2022.3.0-no-clobber-hardened.patch +) + +src_prepare() { + # Has an #error to force compilation as C but links with C++ library, dies + # with GLIBCXX_ASSERTIONS as a result. + sed -i -e '/tbb_add_c_test(SUBDIR tbbmalloc NAME test_malloc_pure_c DEPENDENCIES TBB::tbbmalloc)/d' \ + test/CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # Workaround for bug #912210 + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + local mycmakeargs=( + -DTBB_TEST=$(usex test) + -DTBB_EXAMPLES=OFF # TODO: add this + -DTBB_ENABLE_IPO=OFF + -DTBB_STRICT=OFF + ) + + cmake-multilib_src_configure +} -- cgit v1.3