From 849746a1074045a48202d1850cfba421a81115a0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 16 Sep 2024 07:12:25 +0000 Subject: [PATCH] dev-cpp/abseil-cpp: Sync with Gentoo It's from Gentoo commit 0a56e3ee53bf7b8eec4d3527011b7ef48ceacf28. --- .../dev-cpp/abseil-cpp/Manifest | 1 + .../abseil-cpp-20230802.0-r4.ebuild | 18 ++++ .../abseil-cpp-20240116.2-r4.ebuild | 20 ++++- .../abseil-cpp/abseil-cpp-20240722.0.ebuild | 89 +++++++++++++++++++ .../files/abseil-cpp-20240722.0-lto-odr.patch | 30 +++++++ .../abseil-cpp/files/abseil-cpp-atomic.patch | 18 ++++ .../dev-cpp/abseil-cpp/metadata.xml | 10 ++- 7 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/Manifest b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/Manifest index e652ac7bfe..190373fa4a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/Manifest @@ -4,6 +4,7 @@ DIST abseil-cpp-20230125.2.tar.gz 2119685 BLAKE2B 130e55c68acdec7af0f807189365a5 DIST abseil-cpp-20230125.3.tar.gz 2119655 BLAKE2B 6c60201e4fc2cb5cd942fafb6023347739544f02fd257d003eeedff9e2e5137ee0c954342134d17a64844b9a5f309392a4c3ff9336907f35ba6c967ab03524ee SHA512 50509acfc4128fd31435631f71ac8cd0350acd9e290f78502723149016e7f07c9d84182ba99e0938b1873fecda09393d3fd7af8dabfb0d89cdcdd8a69a917e70 DIST abseil-cpp-20230802.0.tar.gz 2156669 BLAKE2B 34de2f949db3e7578cae39bdd851785fd5327a80662436e7d77f18e196cc28eb1b463e9f49c8fc66060073c6c88222015af8b41044d56af6811c8914e84fbea3 SHA512 320295fa687ded05b774741eb4c5285291d44cc14402ec5d997057cb4f53fb3ba54cd162c7a7b1003312b677603a1c25e14bfdbd1fc22ccf4b4443e8a6e3ec02 DIST abseil-cpp-20240116.2.tar.gz 2151288 BLAKE2B 2e843e29869bf69e46ec48884cbd2ba955eab2329716c4df7b9be0ded550f976184b945587af08d01a7aa77560ae679191c1a1de51c75311d3a5ee87c15017c8 SHA512 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e +DIST abseil-cpp-20240722.0.tar.gz 2242861 BLAKE2B 6756f9a5f70656a6ef1985ba44af69a7fc3ab23b4be8a36ae39d7eedc318a4a9b0da08b31d26b3c46857913a757c916f0e31254278e080497807bed24e4978ce SHA512 bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31 DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954 DIST gtest-e68764c147ea0dac1e8811925c531d937396878e.tar.gz 862129 BLAKE2B d6decb9d1ad4e379a76119ec984deaa7649fca033f225698ce421bcee1207b52da3c4fdb2f6d68b968248575704ebe501b7b1d0a02c180901ffa78f9aa47f549 SHA512 aca72b5f64894aeee34cb869bdeda2d25ec04e901fe0e4e8d08d49472de1c9b19a97ba97a2e8570a88be74aea26d1cd526b4e605005a881e1cb6ab03ed3a4ceb diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild index 81fab0813b..edc9416eea 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild @@ -37,6 +37,8 @@ PATCHES=( src_prepare() { cmake_src_prepare + use ppc && eapply "${FILESDIR}/${PN}-atomic-patch" + # un-hardcode abseil compiler flags sed -i \ -e '/"-maes",/d' \ @@ -66,3 +68,19 @@ multilib_src_configure() { cmake_src_configure } + +multilib_src_test() { + if ! use amd64; then + CMAKE_SKIP_TESTS=( + absl_symbolize_test + ) + + if use ppc; then + CMAKE_SKIP_TESTS+=( + absl_failure_signal_handler_test + ) + fi + fi + + cmake_src_test +} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild index 1f9313c28c..22b35c6f3d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV%%.*}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos" IUSE="test" RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" @@ -37,6 +37,8 @@ PATCHES=( src_prepare() { cmake_src_prepare + use ppc && eapply "${FILESDIR}/${PN}-atomic-patch" + # un-hardcode abseil compiler flags sed -i \ -e '/"-maes",/d' \ @@ -66,3 +68,19 @@ multilib_src_configure() { cmake_src_configure } + +multilib_src_test() { + if ! use amd64; then + CMAKE_SKIP_TESTS=( + absl_symbolize_test + ) + + if use ppc; then + CMAKE_SKIP_TESTS+=( + absl_failure_signal_handler_test + ) + fi + fi + + cmake_src_test +} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild new file mode 100644 index 0000000000..1aadd43217 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild @@ -0,0 +1,89 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit cmake-multilib python-any-r1 + +DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" +HOMEPAGE="https://abseil.io/" +SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV:2:4}.$(ver_cut 2).0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" +IUSE="test" + +RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + test? ( + sys-libs/timezone-data + ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" + # "${FILESDIR}/${PN}-random-tests.patch" #935417 + # "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 + "${FILESDIR}/${PN}-include-cstdint.patch" #937307 + "${FILESDIR}/${PN}-20240722.0-lto-odr.patch" +) + +src_prepare() { + cmake_src_prepare + + use ppc && eapply "${FILESDIR}/${PN}-atomic-patch" + + # un-hardcode abseil compiler flags + sed -i \ + -e '/"-maes",/d' \ + -e '/"-msse4.1",/d' \ + -e '/"-mfpu=neon"/d' \ + -e '/"-march=armv8-a+crypto"/d' \ + absl/copts/copts.py || die + + # now generate cmake files + python_fix_shebang absl/copts/generate_copts.py + absl/copts/generate_copts.py || die +} + +multilib_src_configure() { + local mycmakeargs=( + -DABSL_ENABLE_INSTALL=TRUE + -DABSL_USE_EXTERNAL_GOOGLETEST=ON + -DABSL_PROPAGATE_CXX_STD=TRUE + # TEST_HELPERS needed for protobuf (bug #915902) + -DABSL_BUILD_TEST_HELPERS=ON + -DABSL_BUILD_TESTING="$(usex test)" + ) + # intentional use, it uses both variables for tests. + if use test; then + mycmakeargs+=( + -DBUILD_TESTING="yes" + ) + fi + + cmake_src_configure +} + +multilib_src_test() { + if ! use amd64; then + CMAKE_SKIP_TESTS=( + absl_symbolize_test + ) + + if use ppc; then + CMAKE_SKIP_TESTS+=( + absl_failure_signal_handler_test + ) + fi + fi + + cmake_src_test +} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch new file mode 100644 index 0000000000..93c07b7019 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch @@ -0,0 +1,30 @@ +From 05ed7fe8985d4903fb33031519eb3bc3d1211fa9 Mon Sep 17 00:00:00 2001 +From: Paul Zander +Date: Fri, 30 Aug 2024 02:14:26 +0200 +Subject: [PATCH] lto odr + +Signed-off-by: Paul Zander + +diff --git a/absl/flags/CMakeLists.txt b/absl/flags/CMakeLists.txt +index 7376d11..9914f73 100644 +--- a/absl/flags/CMakeLists.txt ++++ b/absl/flags/CMakeLists.txt +@@ -326,6 +326,7 @@ absl_cc_test( + GTest::gtest_main + ) + ++#[===[ + absl_cc_test( + NAME + flags_flag_test +@@ -349,6 +350,7 @@ absl_cc_test( + absl::time + GTest::gtest_main + ) ++]===] + + absl_cc_test( + NAME +-- +2.46.0 + diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch new file mode 100644 index 0000000000..4a999760eb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch @@ -0,0 +1,18 @@ +From beee02af5b83cfe72159e2579fa3c6e0fb8f93db Mon Sep 17 00:00:00 2001 +From: Paul Zander +Date: Sun, 8 Sep 2024 17:09:17 +0200 +Subject: [PATCH] link to atomic on ppc + +Bug: https://bugs.gentoo.org/918981 +Signed-off-by: Paul Zander + +--- a/absl/base/CMakeLists.txt ++++ b/absl/base/CMakeLists.txt +@@ -131,6 +131,7 @@ absl_cc_library( + absl::base_internal + absl::core_headers + absl::errno_saver ++ atomic + ) + + absl_cc_library( diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/metadata.xml index 8984c4885c..16dd7edb45 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/metadata.xml @@ -1,7 +1,15 @@ - + + + negril.nx+gentoo@gmail.com + Paul Zander + + + proxy-maint@gentoo.org + Proxy Maintainers + abseil/abseil-cpp