[gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/files/, dev-cpp/abseil-cpp/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/files/, dev-cpp/abseil-cpp/
@ 2021-04-02  3:04 Georgy Yakovlev
  0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2021-04-02  3:04 UTC (permalink / raw
  To: gentoo-commits

commit:     619cfe3daec298493d31030008efc12e5ebbf7ec
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Mar 29 18:00:00 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Apr  2 03:03:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=619cfe3d

dev-cpp/abseil-cpp: Fix building on ARM{32,64} CPUs without crypto extension.

Closes: https://bugs.gentoo.org/778926
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-cpp/abseil-cpp/abseil-cpp-20200923.2.ebuild          | 14 ++++++++++++--
 .../files/abseil-cpp-20200923-arm_no_crypto.patch        | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200923.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200923.2.ebuild
index 8e62b032d05..90be485e13a 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200923.2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200923.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit cmake python-any-r1
+inherit cmake python-any-r1 toolchain-funcs
 
 # yes, it needs SOURCE, not just installed one
 GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
@@ -34,6 +34,10 @@ BDEPEND="
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 
@@ -53,6 +57,12 @@ src_prepare() {
 }
 
 src_configure() {
+	if use arm || use arm64; then
+		if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then
+			append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO
+		fi
+	fi
+
 	local mycmakeargs=(
 		-DABSL_ENABLE_INSTALL=TRUE
 		-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch
new file mode 100644
index 00000000000..b74a6c70e90
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch
@@ -0,0 +1,16 @@
+--- /absl/random/internal/randen_hwaes.cc
++++ /absl/random/internal/randen_hwaes.cc
+@@ -50,8 +50,11 @@
+     (defined(__ARM_NEON) && defined(__ARM_FEATURE_CRYPTO))
+ #define ABSL_RANDEN_HWAES_IMPL 1
+ 
+-#elif ABSL_RANDOM_INTERNAL_AES_DISPATCH && !defined(__APPLE__) && \
+-    (defined(__GNUC__) && __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 9)
++// When ABSL_ARCH_ARM_NO_CRYPTO is defined, then ARM CPU without
++// crypto extension is assumed.
++#elif !defined(ABSL_ARCH_ARM_NO_CRYPTO) && \
++    (ABSL_RANDOM_INTERNAL_AES_DISPATCH && !defined(__APPLE__) && \
++    (defined(__GNUC__) && __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 9))
+ // ...or, on GCC, we can use an ASM directive to
+ // instruct the assember to allow crypto instructions.
+ #define ABSL_RANDEN_HWAES_IMPL 1


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/files/, dev-cpp/abseil-cpp/
@ 2022-02-07  1:58 Jason Zaman
  0 siblings, 0 replies; 9+ messages in thread
From: Jason Zaman @ 2022-02-07  1:58 UTC (permalink / raw
  To: gentoo-commits

commit:     a7db6f594b175eebbf00de4ad8af0280198eae72
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  6 23:58:10 2022 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 01:56:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7db6f59

dev-cpp/abseil-cpp: Fix build with CUDA nvcc

Minor patch needed for tensorflow to unbundle abseil.
Acked by gyakovlev on IRC.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild | 72 ++++++++++++++++++++++
 ...abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch | 58 +++++++++++++++++
 2 files changed, 130 insertions(+)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild
new file mode 100644
index 000000000000..9873c85b8ee8
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake python-any-r1
+
+# yes, it needs SOURCE, not just installed one
+# and no, 1.11.0 is not enough
+GTEST_COMMIT="1b18723e874b256c1e39378c6774a90701d70f7a"
+GTEST_FILE="gtest-${GTEST_COMMIT}.tar.gz"
+
+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
+	test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )"
+
+LICENSE="
+	Apache-2.0
+	test? ( BSD )
+"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( sys-libs/timezone-data )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20211102.0-fix-cuda-nvcc-build.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# 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
+
+	if use test; then
+		sed -i 's/-Werror//g' \
+			"${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DABSL_ENABLE_INSTALL=TRUE
+		-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
+		-DCMAKE_CXX_STANDARD=17
+		-DABSL_PROPAGATE_CXX_STD=TRUE
+		$(usex test -DBUILD_TESTING=ON '') #intentional usex
+	)
+	cmake_src_configure
+}

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch
new file mode 100644
index 000000000000..45a9fc5406e8
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch
@@ -0,0 +1,58 @@
+Fixes compile failure with CUDA nvcc
+https://github.com/abseil/abseil-cpp/commit/5202173ca7671ebe241cb4d9447dc4b1f2d3ec10
+https://github.com/tensorflow/tensorflow/commit/e45ca6adf2458d4759e5c40f1f27bbf9505a3c79#diff-b79a9a542260a33fd122a5d1cdb923e08e16cbe321d69c014a9acdde34052b3dR235
+
+From 5202173ca7671ebe241cb4d9447dc4b1f2d3ec10 Mon Sep 17 00:00:00 2001
+From: Abseil Team <absl-team@google.com>
+Date: Tue, 1 Feb 2022 13:52:49 -0800
+Subject: [PATCH] Export of internal Abseil changes
+
+--
+121db1a08321eaa3006726cc32b459cf17880e35 by Derek Mauro <dmauro@google.com>:
+
+Internal change
+
+PiperOrigin-RevId: 425707805
+
+--
+0dec484389bbb75aae0a412146e3564bf833a739 by Derek Mauro <dmauro@google.com>:
+
+macOS CI: Avoid depending on external sites like GitHub by prepopulating
+dependencies and setting --distdir
+
+Our Linux CI does this, but for some reason was never enabled on macOS
+
+PiperOrigin-RevId: 425668638
+GitOrigin-RevId: 121db1a08321eaa3006726cc32b459cf17880e35
+Change-Id: Id51645df90b6a0808dd5b18eb636a10f798e24ea
+---
+ absl/container/internal/inlined_vector.h |  8 ++++----
+ ci/macos_xcode_bazel.sh                  | 10 +++++++++-
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/absl/container/internal/inlined_vector.h b/absl/container/internal/inlined_vector.h
+index cd34a413a..2baf26f3e 100644
+--- a/absl/container/internal/inlined_vector.h
++++ b/absl/container/internal/inlined_vector.h
+@@ -925,8 +925,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void {
+                            inlined_ptr->GetSize());
+     }
+     ABSL_INTERNAL_CATCH_ANY {
+-      allocated_ptr->SetAllocation(
+-          {allocated_storage_view.data, allocated_storage_view.capacity});
++      allocated_ptr->SetAllocation(Allocation<A>{
++          allocated_storage_view.data, allocated_storage_view.capacity});
+       ABSL_INTERNAL_RETHROW;
+     }
+ 
+@@ -934,8 +934,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void {
+                                        inlined_ptr->GetInlinedData(),
+                                        inlined_ptr->GetSize());
+ 
+-    inlined_ptr->SetAllocation(
+-        {allocated_storage_view.data, allocated_storage_view.capacity});
++    inlined_ptr->SetAllocation(Allocation<A>{allocated_storage_view.data,
++                                             allocated_storage_view.capacity});
+   }
+ 
+   swap(GetSizeAndIsAllocated(), other_storage_ptr->GetSizeAndIsAllocated());


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/files/, dev-cpp/abseil-cpp/
@ 2022-08-23  7:30 WANG Xuerui
  0 siblings, 0 replies; 9+ messages in thread
From: WANG Xuerui @ 2022-08-23  7:30 UTC (permalink / raw
  To: gentoo-commits

commit:     227b524fe01fd6329b8dd8ee7bbd9bef97d106a7
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 16:11:27 2022 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 07:28:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=227b524f

dev-cpp/abseil-cpp: 20211102.0-r2: fix build on gcc-13

Fixes: https://bugs.gentoo.org/865211
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild |  1 +
 .../files/abseil-cpp-20211102.0-r2-gcc-13.patch    | 24 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
index 240032cfb51a..18e085a451a8 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-20211102.0-fix-cuda-nvcc-build.patch"
 	"${FILESDIR}/${PN}-20211102.0-r2-cuda11.6-compile-fix.patch"
 	"${FILESDIR}/${PN}-20211102.0-r2-loong.patch"
+	"${FILESDIR}/${PN}-20211102.0-r2-gcc-13.patch"
 )
 
 src_prepare() {

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch
new file mode 100644
index 000000000000..2a847be09e9a
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch
@@ -0,0 +1,24 @@
+https://github.com/abseil/abseil-cpp/commit/36a4b073f1e7e02ed7d1ac140767e36f82f09b7c
+
+From 36a4b073f1e7e02ed7d1ac140767e36f82f09b7c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Fri, 27 May 2022 22:27:58 +0100
+Subject: [PATCH] absl/strings/internal/str_format/extension.h: add missing
+ <stdint.h> include
+
+Without the change absl-cpp build fails on this week's gcc-13 snapshot as:
+
+    /build/abseil-cpp/absl/strings/internal/str_format/extension.h:34:33: error: found ':' in nested-name-specifier, expected '::'
+       34 | enum class FormatConversionChar : uint8_t;
+          |                                 ^
+          |                                 ::
+--- a/absl/strings/internal/str_format/extension.h
++++ b/absl/strings/internal/str_format/extension.h
+@@ -17,6 +17,7 @@
+ #define ABSL_STRINGS_INTERNAL_STR_FORMAT_EXTENSION_H_
+ 
+ #include <limits.h>
++#include <stdint.h>
+ 
+ #include <cstddef>
+ #include <cstring>


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/files/, dev-cpp/abseil-cpp/
@ 2023-07-05  0:40 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2023-07-05  0:40 UTC (permalink / raw
  To: gentoo-commits

commit:     6f43c861641423191d2d5fce9605f8e23a452c84
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri Jun  9 19:58:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 00:40:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f43c861

dev-cpp/abseil-cpp: fix build with musl-1.2.4

Closes: https://bugs.gentoo.org/906218
Upstream-Issue: https://github.com/abseil/abseil-cpp/issues/1473
Upstream-Commit: https://github.com/abseil/abseil-cpp/commit/4500c2fada4e952037c59bd65e8be1ba0b29f21e
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/31367
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild    |  4 ++
 .../files/abseil-cpp-20230125.2-musl-1.2.4.patch   | 49 ++++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild
index 067f0d0a0876..f80007d0052b 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild
@@ -31,6 +31,10 @@ BDEPEND="
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218
+)
+
 src_prepare() {
 	cmake_src_prepare
 

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20230125.2-musl-1.2.4.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20230125.2-musl-1.2.4.patch
new file mode 100644
index 000000000000..e4834250cfc9
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20230125.2-musl-1.2.4.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/906218
+https://github.com/abseil/abseil-cpp/issues/1473
+https://github.com/abseil/abseil-cpp/commit/4500c2fada4e952037c59bd65e8be1ba0b29f21e
+
+From 4500c2fada4e952037c59bd65e8be1ba0b29f21e Mon Sep 17 00:00:00 2001
+From: Derek Mauro <dmauro@google.com>
+Date: Mon, 12 Jun 2023 08:11:36 -0700
+Subject: [PATCH] DirectMmap: Use off_t instead of off64_t for the offset
+ parameter
+
+off_t is best for portability. Its size varies with the platform.
+off64_t is non-standard, but is present in glibc and some BSDs.
+It also matches the signature specified in the manual.
+https://man7.org/linux/man-pages/man2/mmap.2.html
+
+This is a re-spin of #1349, but correctly casts the type to the type
+expected by the kernel for mmap2.
+https://man7.org/linux/man-pages/man2/mmap2.2.html
+
+Fixes #1473
+
+PiperOrigin-RevId: 539656313
+Change-Id: I7a30dd9d3eb6af03a99da0d93d721a86f6521b25
+---
+ absl/base/internal/direct_mmap.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h
+index 815b8d23ba3..1beb2ee4e52 100644
+--- a/absl/base/internal/direct_mmap.h
++++ b/absl/base/internal/direct_mmap.h
+@@ -72,7 +72,7 @@ namespace base_internal {
+ // Platform specific logic extracted from
+ // https://chromium.googlesource.com/linux-syscall-support/+/master/linux_syscall_support.h
+ inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd,
+-                        off64_t offset) noexcept {
++                        off_t offset) noexcept {
+ #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \
+     defined(__m68k__) || defined(__sh__) ||                                  \
+     (defined(__hppa__) && !defined(__LP64__)) ||                             \
+@@ -102,7 +102,7 @@ inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd,
+ #else
+   return reinterpret_cast<void*>(
+       syscall(SYS_mmap2, start, length, prot, flags, fd,
+-              static_cast<off_t>(offset / pagesize)));
++              static_cast<unsigned long>(offset / pagesize)));  // NOLINT
+ #endif
+ #elif defined(__s390x__)
+   // On s390x, mmap() arguments are passed in memory.


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/files/, dev-cpp/abseil-cpp/
@ 2024-07-13 17:10 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-07-13 17:10 UTC (permalink / raw
  To: gentoo-commits

commit:     d659f8343fd5d700934e37a3b0b86d247d4ef2ed
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Jul 13 16:20:56 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 17:08:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d659f834

dev-cpp/abseil-cpp: make use of lzcnt conditional

Closes: https://bugs.gentoo.org/934337
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37543
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...0-r2.ebuild => abseil-cpp-20230125.3-r4.ebuild} |  9 ++--
 ...0-r2.ebuild => abseil-cpp-20230802.0-r3.ebuild} |  1 +
 ...2-r2.ebuild => abseil-cpp-20240116.2-r3.ebuild} |  1 +
 ...l-cpp-20230802.0-conditional-use-of-lzcnt.patch | 49 ++++++++++++++++++++++
 4 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild
similarity index 85%
copy from dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild
copy to dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild
index 9a9c217bda00..87f1b86c7690 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild
@@ -12,8 +12,8 @@ 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%%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0/${PV%%.*}.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]"
@@ -28,8 +28,9 @@ BDEPEND="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-20230802.0-sdata-tests.patch"
-	"${FILESDIR}/${PN}-random-tests.patch" #935417
+	"${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218
+	"${FILESDIR}"/${PN}-random-tests.patch #935417
+	"${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337
 )
 
 src_prepare() {

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild
similarity index 95%
rename from dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild
rename to dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild
index 9a9c217bda00..dc13dfe5045f 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild
@@ -30,6 +30,7 @@ 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
 )
 
 src_prepare() {

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild
similarity index 95%
rename from dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild
rename to dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild
index 9a9c217bda00..dc13dfe5045f 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild
@@ -30,6 +30,7 @@ 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
 )
 
 src_prepare() {

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch
new file mode 100644
index 000000000000..1fa00d9ff622
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch
@@ -0,0 +1,49 @@
+Bug: https://bugs.gentoo.org/934337
+From: https://github.com/abseil/abseil-cpp/commit/c1e1b47d989978cde8c5a2a219df425b785a0c47.patch
+From c1e1b47d989978cde8c5a2a219df425b785a0c47 Mon Sep 17 00:00:00 2001
+From: Derek Mauro <dmauro@google.com>
+Date: Fri, 3 May 2024 09:14:22 -0700
+Subject: [PATCH] Use __builtin_ctzg and __builtin_clzg in the implementations
+ of CountTrailingZeroesNonzero16 and CountLeadingZeroes16 when they are
+ available.
+
+GCC 14 and Clang 19 adds these new builtins. The g-suffix is for
+"generic". The s-suffix on __builtin_ctzs and __builtin_clzs is for
+"short". GCC never implemented the short versions and #1664 reports
+GCC 14 (pre-release) gives an error here, although this may be a
+pre-release bug.
+
+Fixes #1664
+
+PiperOrigin-RevId: 630408249
+Change-Id: I4aedcc82b85430f50d025f8eb1cab089c6fcd1bc
+---
+ absl/numeric/internal/bits.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/absl/numeric/internal/bits.h b/absl/numeric/internal/bits.h
+index bfef06bce1f..0917464d6ad 100644
+--- a/absl/numeric/internal/bits.h
++++ b/absl/numeric/internal/bits.h
+@@ -167,7 +167,9 @@ CountLeadingZeroes32(uint32_t x) {
+ 
+ ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CLZ inline int
+ CountLeadingZeroes16(uint16_t x) {
+-#if ABSL_HAVE_BUILTIN(__builtin_clzs)
++#if ABSL_HAVE_BUILTIN(__builtin_clzg)
++  return x == 0 ? 16 : __builtin_clzg(x);
++#elif ABSL_HAVE_BUILTIN(__builtin_clzs)
+   static_assert(sizeof(unsigned short) == sizeof(x),  // NOLINT(runtime/int)
+                 "__builtin_clzs does not take 16-bit arg");
+   return x == 0 ? 16 : __builtin_clzs(x);
+@@ -303,7 +305,9 @@ CountTrailingZeroesNonzero64(uint64_t x) {
+ 
+ ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CTZ inline int
+ CountTrailingZeroesNonzero16(uint16_t x) {
+-#if ABSL_HAVE_BUILTIN(__builtin_ctzs)
++#if ABSL_HAVE_BUILTIN(__builtin_ctzg)
++  return __builtin_ctzg(x);
++#elif ABSL_HAVE_BUILTIN(__builtin_ctzs)
+   static_assert(sizeof(unsigned short) == sizeof(x),  // NOLINT(runtime/int)
+                 "__builtin_ctzs does not take 16-bit arg");
+   return __builtin_ctzs(x);


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/files/, dev-cpp/abseil-cpp/
@ 2024-08-07 13:04 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-08-07 13:04 UTC (permalink / raw
  To: gentoo-commits

commit:     fcd9acca22780aff0bcae40d9a110213f00b243f
Author:     Christopher Fore <csfore <AT> posteo <DOT> net>
AuthorDate: Wed Aug  7 12:55:22 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 13:03:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcd9acca

dev-cpp/abseil-cpp: Fix compilation on GCC 15

- Tests pass
- Include patch from upstream including <cstdint>
- 20211102.0-r2 and 20220623.1 need an additional commit backported from
  upstream so those will be done at a later time.

Bug: https://bugs.gentoo.org/937307
Signed-off-by: Christopher Fore <csfore <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/37987
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild | 68 ++++++++++++++++++++++
 dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild | 68 ++++++++++++++++++++++
 dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild | 68 ++++++++++++++++++++++
 .../files/abseil-cpp-include-cstdint.patch         | 33 +++++++++++
 4 files changed, 237 insertions(+)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild
new file mode 100644
index 000000000000..e16880542a7a
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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%%.*}.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+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}-20230125.2-musl-1.2.4.patch #906218
+	"${FILESDIR}"/${PN}-random-tests.patch #935417
+	"${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337
+	"${FILESDIR}/${PN}-include-cstdint.patch" #937307
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# 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=(
+		# We use -std=c++14 here so that abseil-cpp's string_view is used
+		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
+		-DCMAKE_CXX_STANDARD=14
+		-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 ON OFF)
+		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
+	)
+
+	cmake_src_configure
+}

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild
new file mode 100644
index 000000000000..81fab0813b28
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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%%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+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"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# 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=(
+		# We use -std=c++14 here so that abseil-cpp's string_view is used
+		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
+		-DCMAKE_CXX_STANDARD=14
+		-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 ON OFF)
+		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
+	)
+
+	cmake_src_configure
+}

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
new file mode 100644
index 000000000000..28286c4d74e6
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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%%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+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
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# 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=(
+		# We use -std=c++14 here so that abseil-cpp's string_view is used
+		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
+		-DCMAKE_CXX_STANDARD=14
+		-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 ON OFF)
+		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
+	)
+
+	cmake_src_configure
+}

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-include-cstdint.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-include-cstdint.patch
new file mode 100644
index 000000000000..7aa5c2f1eed9
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-include-cstdint.patch
@@ -0,0 +1,33 @@
+https://github.com/abseil/abseil-cpp/commit/809e5de7b92950849289236a5a09e9cb4f32c7b9
+
+From: Christopher Fore <csfore@posteo.net>
+Date: Mon, 5 Aug 2024 10:48:19 -0400
+Subject: [PATCH] container/internal: Explicitly include <cstdint>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC 15 will no longer include <cstdint> by default, resulting in build
+failures in projects that do not explicitly include it.
+
+Error:
+absl/container/internal/container_memory.h:66:27: error: ‘uintptr_t’ does not name a type
+   66 |   assert(reinterpret_cast<uintptr_t>(p) % Alignment == 0 &&
+      |                           ^~~~~~~~~
+absl/container/internal/container_memory.h:31:1: note: ‘uintptr_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’
+   30 | #include "absl/utility/utility.h"
+  +++ |+#include <cstdint>
+   31 |
+
+See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html
+Signed-off-by: Christopher Fore <csfore@posteo.net>
+--- a/absl/container/internal/container_memory.h
++++ b/absl/container/internal/container_memory.h
+@@ -17,6 +17,7 @@
+ 
+ #include <cassert>
+ #include <cstddef>
++#include <cstdint>
+ #include <cstring>
+ #include <memory>
+ #include <new>


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/files/, dev-cpp/abseil-cpp/
@ 2024-09-08 17:16 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-09-08 17:16 UTC (permalink / raw
  To: gentoo-commits

commit:     60170e6ac00beac1291c3590dbe7e01d00764b01
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sun Sep  8 16:56:26 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 17:15:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60170e6a

dev-cpp/abseil-cpp: fix building on ppc

Link in `atomic` on ppc.

Disable failing test.

Closes: https://bugs.gentoo.org/918981
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild |  8 ++++++++
 dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild |  8 ++++++++
 dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild    |  8 ++++++++
 dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch   | 18 ++++++++++++++++++
 4 files changed, 42 insertions(+)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild
index 0b14ce25555a..edc9416eea6c 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild
+++ b/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' \
@@ -72,6 +74,12 @@ multilib_src_test() {
 		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/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
index 4b8e434135ba..22b35c6f3d53 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-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' \
@@ -72,6 +74,12 @@ multilib_src_test() {
 		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/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild
index 4e5ca3c27ebc..7ef9cbac31e5 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild
@@ -38,6 +38,8 @@ PATCHES=(
 src_prepare() {
 	cmake_src_prepare
 
+	use ppc && eapply "${FILESDIR}/${PN}-atomic-patch"
+
 	# un-hardcode abseil compiler flags
 	sed -i \
 		-e '/"-maes",/d' \
@@ -75,6 +77,12 @@ multilib_src_test() {
 		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/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch
new file mode 100644
index 000000000000..4a999760eb0f
--- /dev/null
+++ b/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 <negril.nx+gentoo@gmail.com>
+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 <negril.nx+gentoo@gmail.com>
+
+--- 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(


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/files/, dev-cpp/abseil-cpp/
@ 2025-04-05  0:42 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2025-04-05  0:42 UTC (permalink / raw
  To: gentoo-commits

commit:     118f77923e182362bb1bcb45756c4679251dcdbf
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Mar  3 15:27:40 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  5 00:39:47 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118f7792

dev-cpp/abseil-cpp: add 20250127.0, 20240722.1, 20240116.3, 20230802.3

Closes: https://bugs.gentoo.org/942192
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-cpp/abseil-cpp/Manifest                        |  5 +++
 ...22.0-r1.ebuild => abseil-cpp-20230802.3.ebuild} | 24 +++++++++-----
 ...22.0-r1.ebuild => abseil-cpp-20240116.3.ebuild} | 22 +++++++++----
 dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild |  1 +
 ...22.0-r1.ebuild => abseil-cpp-20240722.1.ebuild} | 14 +++++---
 ...22.0-r1.ebuild => abseil-cpp-20250127.0.ebuild} | 33 ++++++++++++-------
 .../abseil-cpp-20240722.0-ciso646-cxx17.patch      | 37 ++++++++++++++++++++++
 7 files changed, 105 insertions(+), 31 deletions(-)

diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 190373fa4aab..936c01a30a89 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -3,8 +3,13 @@ DIST abseil-cpp-20220623.1.tar.gz 1957483 BLAKE2B 5bcf60b5a55882bcb78c7095a9892f
 DIST abseil-cpp-20230125.2.tar.gz 2119685 BLAKE2B 130e55c68acdec7af0f807189365a5206427fe0bcf564a2ece9837d84429505e763399384fae89a07db6b68ed18c63918dc5ae0e53e59cdb844e4d524932abf5 SHA512 b2ba5023610aacb680b22bef894372810e6e7df76e630e56ac2f4b9498f70a872171f4562f6560ab78e837437b7bcfd3c47bfc2a5bb7fb20f28ec490dc8ed61f
 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-20230802.3.tar.gz 2157817 BLAKE2B 1fa88220b78ec714e5a50f79d7c9a258c65e64b0a98d9d3047cabbfd7e793ebfd35f90440621a69afb8dc840503b52c1a7c151af66235f1916101869d0db0e81 SHA512 9ae22d9d69a2225ce5fd6807b721434aea66b7d2244060e1d70f1ee6ed2b9c4e4ca56f7fc3785c8a67a7f483e5f0234e86184d382371bf681c08f1bdbfb0e8b9
 DIST abseil-cpp-20240116.2.tar.gz 2151288 BLAKE2B 2e843e29869bf69e46ec48884cbd2ba955eab2329716c4df7b9be0ded550f976184b945587af08d01a7aa77560ae679191c1a1de51c75311d3a5ee87c15017c8 SHA512 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e
+DIST abseil-cpp-20240116.3.tar.gz 2152015 BLAKE2B a499d01c13440b9b2788a8018777f8f08e653471b9d1549069007adc75bfae5ec7c37a545983b2077e4e39e3f459ab702d0d7d7828bcdc2583889fac15ee39f7 SHA512 8e7fb3aa355c56ae42820f5c53226091e01227f48c6ace05432b14ee0401cb62adbc67c520420b41cff512de3f6b09f96fadc58d36b8ebc649bd1c12c1fe8298
 DIST abseil-cpp-20240722.0.tar.gz 2242861 BLAKE2B 6756f9a5f70656a6ef1985ba44af69a7fc3ab23b4be8a36ae39d7eedc318a4a9b0da08b31d26b3c46857913a757c916f0e31254278e080497807bed24e4978ce SHA512 bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31
+DIST abseil-cpp-20240722.1.tar.gz 2242894 BLAKE2B fc20e3bb734ae17cd7d808cdf08e624a511d77255d17023104d3f3a5ad4844bc0b0618a9792a06492da5287f4f5cd8151ebbf4ab7c703c62d9fcdc955928b944 SHA512 6062a10220d1250127e2216cea65833f10f37459331254b59df437b5061af81a9645cab39479700cf1843ef7dee51fe125241b0ecb9f715705a45dce4ffae89e
+DIST abseil-cpp-20250127.0-PR1834.patch 968 BLAKE2B b563725afcae9fcbddde9aef1e492ed9ca13201a3cb817044c2fa62a8d47d79600a2b1cb6018bb12a21a27fe765ab4a6f1b43239401d97962fd794520cff3ded SHA512 28bd3cea659ba400da928d8ce2bdf6a8dd25a3991abdca74b6cf7893e0ac206eb95b6f94beeb0a02516b4403da20e088e42553705c024f5f5730281248c2acaf
+DIST abseil-cpp-20250127.0.tar.gz 2267275 BLAKE2B 70fa05a0db91b9e7ccf9f2828a7bf4b7fe6d7177b5f2d17b2f2f6f2a5e83289674d624fa7983410713a2d62b1025a5b5d957f1ba11e01cb727fc771ce76bc914 SHA512 2a021faad807ee3e23548716ffa4785dc2409edbb4be676cc4bc01d47885760de340f0a4afdcbf0aaa835affd6d78f7bc319bbf7d337dbc30e7a559d0088e4bd
 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/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild
similarity index 71%
copy from dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild
copy to dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild
index 829b2d4c0484..dd1810a5fe1a 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake-multilib python-any-r1
 
@@ -13,10 +13,14 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV:2:4}.$(ver_cut 2).0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
-RDEPEND=">=dev-cpp/gtest-1.13.0:=[${MULTILIB_USEDEP}]"
+RDEPEND="
+	test? (
+		dev-cpp/gtest:=[${MULTILIB_USEDEP}]
+	)
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
@@ -29,10 +33,10 @@ 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"
+	"${FILESDIR}/${PN}-random-tests.patch" #935417
+	"${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337
+	"${FILESDIR}/${PN}-include-cstdint.patch"
+	"${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch"
 )
 
 src_prepare() {
@@ -46,6 +50,7 @@ src_prepare() {
 		-e '/"-msse4.1",/d' \
 		-e '/"-mfpu=neon"/d' \
 		-e '/"-march=armv8-a+crypto"/d' \
+		-e '/NOMINMAX/d' \
 		absl/copts/copts.py || die
 
 	# now generate cmake files
@@ -55,11 +60,14 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
+		# We use -std=c++14 here so that abseil-cpp's string_view is used
+		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
+		-DCMAKE_CXX_STANDARD=14
 		-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_TEST_HELPERS="$(usex test)"
 		-DABSL_BUILD_TESTING="$(usex test)"
 	)
 	# intentional use, it uses both variables for tests.

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild
similarity index 72%
copy from dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild
copy to dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild
index 829b2d4c0484..9f5cd6299aed 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake-multilib python-any-r1
 
@@ -13,10 +13,14 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV:2:4}.$(ver_cut 2).0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc 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}]"
+RDEPEND="
+	test? (
+		dev-cpp/gtest:=[${MULTILIB_USEDEP}]
+	)
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
@@ -29,10 +33,10 @@ 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}-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"
+	"${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch"
 )
 
 src_prepare() {
@@ -46,6 +50,7 @@ src_prepare() {
 		-e '/"-msse4.1",/d' \
 		-e '/"-mfpu=neon"/d' \
 		-e '/"-march=armv8-a+crypto"/d' \
+		-e '/NOMINMAX/d' \
 		absl/copts/copts.py || die
 
 	# now generate cmake files
@@ -55,11 +60,14 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
+		# We use -std=c++14 here so that abseil-cpp's string_view is used
+		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
+		-DCMAKE_CXX_STANDARD=14
 		-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_TEST_HELPERS="$(usex test)"
 		-DABSL_BUILD_TESTING="$(usex test)"
 	)
 	# intentional use, it uses both variables for tests.

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild
index 829b2d4c0484..09f1e9456316 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild
@@ -46,6 +46,7 @@ src_prepare() {
 		-e '/"-msse4.1",/d' \
 		-e '/"-mfpu=neon"/d' \
 		-e '/"-march=armv8-a+crypto"/d' \
+		-e '/NOMINMAX/d' \
 		absl/copts/copts.py || die
 
 	# now generate cmake files

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild
similarity index 83%
copy from dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild
copy to dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild
index 829b2d4c0484..980635fdd36e 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild
@@ -13,10 +13,14 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV:2:4}.$(ver_cut 2).0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="test"
 
-RDEPEND=">=dev-cpp/gtest-1.13.0:=[${MULTILIB_USEDEP}]"
+RDEPEND="
+	test? (
+		dev-cpp/gtest:=[${MULTILIB_USEDEP}]
+	)
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
@@ -29,10 +33,9 @@ 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"
+	"${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch"
 )
 
 src_prepare() {
@@ -46,6 +49,7 @@ src_prepare() {
 		-e '/"-msse4.1",/d' \
 		-e '/"-mfpu=neon"/d' \
 		-e '/"-march=armv8-a+crypto"/d' \
+		-e '/NOMINMAX/d' \
 		absl/copts/copts.py || die
 
 	# now generate cmake files
@@ -59,7 +63,7 @@ multilib_src_configure() {
 		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
 		-DABSL_PROPAGATE_CXX_STD=TRUE
 		# TEST_HELPERS needed for protobuf (bug #915902)
-		-DABSL_BUILD_TEST_HELPERS=ON
+		-DABSL_BUILD_TEST_HELPERS="$(usex test)"
 		-DABSL_BUILD_TESTING="$(usex test)"
 	)
 	# intentional use, it uses both variables for tests.

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild
similarity index 68%
copy from dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild
copy to dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild
index 829b2d4c0484..896be16ff5ca 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild
@@ -9,14 +9,22 @@ 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"
+SRC_URI="
+	https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/abseil/abseil-cpp/commit/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch
+		-> ${PN}-20250127.0-PR1834.patch
+"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV:2:4}.$(ver_cut 2).0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="test"
 
-RDEPEND=">=dev-cpp/gtest-1.13.0:=[${MULTILIB_USEDEP}]"
+RDEPEND="
+	test? (
+		dev-cpp/gtest:=[${MULTILIB_USEDEP}]
+	)
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
@@ -29,10 +37,9 @@ 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"
+	"${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch"
+	"${DISTDIR}/${PN}-20250127.0-PR1834.patch"
 )
 
 src_prepare() {
@@ -41,11 +48,9 @@ src_prepare() {
 	use ppc && eapply "${FILESDIR}/${PN}-atomic.patch"
 
 	# un-hardcode abseil compiler flags
+	# 942192
 	sed -i \
-		-e '/"-maes",/d' \
-		-e '/"-msse4.1",/d' \
-		-e '/"-mfpu=neon"/d' \
-		-e '/"-march=armv8-a+crypto"/d' \
+		-e '/NOMINMAX/d' \
 		absl/copts/copts.py || die
 
 	# now generate cmake files
@@ -59,7 +64,7 @@ multilib_src_configure() {
 		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
 		-DABSL_PROPAGATE_CXX_STD=TRUE
 		# TEST_HELPERS needed for protobuf (bug #915902)
-		-DABSL_BUILD_TEST_HELPERS=ON
+		-DABSL_BUILD_TEST_HELPERS="$(usex test)"
 		-DABSL_BUILD_TESTING="$(usex test)"
 	)
 	# intentional use, it uses both variables for tests.
@@ -83,6 +88,12 @@ multilib_src_test() {
 				absl_failure_signal_handler_test
 			)
 		fi
+	else
+		if ! multilib_is_native_abi; then
+			CMAKE_SKIP_TESTS+=(
+				absl_hash_instantiated_test
+			)
+		fi
 	fi
 
 	cmake_src_test

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch
new file mode 100644
index 000000000000..8cc39ee9fc58
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch
@@ -0,0 +1,37 @@
+From 6be17375f9142017d34bd0b577cdf4e91225c135 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Fri, 22 Nov 2024 19:46:05 +0100
+Subject: [PATCH] don't include <ciso646> with c++17
+
+[179/825] Building CXX object absl/log/CMakeFiles/log_globals.dir/globals.cc.o
+In file included from
+/var/tmp/paludis/dev-cpp-abseil-cpp-20240722.0/work/abseil-cpp-20240722.0/absl/hash/internal/hash.h:33,
+from
+/var/tmp/paludis/dev-cpp-abseil-cpp-20240722.0/work/abseil-cpp-20240722.0/absl/hash/hash.h:85,
+from
+/var/tmp/paludis/dev-cpp-abseil-cpp-20240722.0/work/abseil-cpp-20240722.0/absl/log/globals.cc:29:
+/usr/lib/gcc/x86_64-pc-linux-gnu/15/include/g++-v15/ciso646:46:4: warning:
+#warning "<ciso646> is deprecated in C++17, use <version> to detect
+implementation-specific macros" [-Wcpp]
+46 | #  warning "<ciso646> is deprecated in C++17, use <version> to detect
+implementation-specific macros"
+      |    ^~~~~~~
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/absl/hash/internal/hash.h b/absl/hash/internal/hash.h
+index 03bf183..3222be3 100644
+--- a/absl/hash/internal/hash.h
++++ b/absl/hash/internal/hash.h
+@@ -27,7 +27,7 @@
+ #include "absl/base/config.h"
+ 
+ // For feature testing and determining which headers can be included.
+-#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L
++#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 201703L
+ #include <version>
+ #else
+ #include <ciso646>
+-- 
+2.47.0
+


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/files/, dev-cpp/abseil-cpp/
@ 2025-08-01  8:10 Sam James
  0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2025-08-01  8:10 UTC (permalink / raw
  To: gentoo-commits

commit:     22b30e5a93ae51e3d1b891f66b6e4db6b3dbc92c
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sun Jul 20 18:31:21 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug  1 08:08:17 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b30e5a

dev-cpp/abseil-cpp: drop obsolete ciso646 workaround

This has been fix in gcc by now.

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43085
Closes: https://github.com/gentoo/gentoo/pull/43085
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild    |  1 -
 dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild    |  1 -
 dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild    |  1 -
 dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild    |  1 -
 dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild    |  1 -
 .../abseil-cpp-20240722.0-ciso646-cxx17.patch      | 37 ----------------------
 6 files changed, 42 deletions(-)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild
index 020e26fc0ec0..1c81b0bb09fb 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild
@@ -36,7 +36,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-random-tests.patch" #935417
 	"${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337
 	"${FILESDIR}/${PN}-include-cstdint.patch"
-	"${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch"
 )
 
 src_prepare() {

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild
index e99a4b190279..ee464962941d 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild
@@ -36,7 +36,6 @@ PATCHES=(
 	"${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-ciso646-cxx17.patch"
 )
 
 src_prepare() {

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild
index 8fffaba1bbb5..1aa778570e64 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild
@@ -38,7 +38,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-20230802.0-sdata-tests.patch"
 	"${FILESDIR}/${PN}-include-cstdint.patch" #937307
 	"${FILESDIR}/${PN}-20240722.0-lto-odr.patch"
-	"${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch"
 )
 
 src_prepare() {

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild
index 89583d7032e8..4dd9b57af1f8 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild
@@ -41,7 +41,6 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}/${PN}-20230802.0-sdata-tests.patch"
 	"${FILESDIR}/${PN}-20240722.0-lto-odr.patch"
-	"${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch"
 	"${DISTDIR}/${PN}-20250127.0-PR1834.patch"
 )
 

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild
index 2ae9c60bc5d6..13e80e90f597 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild
@@ -41,7 +41,6 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}/${PN}-20230802.0-sdata-tests.patch"
 	"${FILESDIR}/${PN}-20240722.0-lto-odr.patch"
-	"${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch"
 	"${DISTDIR}/${PN}-20250127.0-PR1834.patch"
 )
 

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch
deleted file mode 100644
index 8cc39ee9fc58..000000000000
--- a/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6be17375f9142017d34bd0b577cdf4e91225c135 Mon Sep 17 00:00:00 2001
-From: Paul Zander <negril.nx+gentoo@gmail.com>
-Date: Fri, 22 Nov 2024 19:46:05 +0100
-Subject: [PATCH] don't include <ciso646> with c++17
-
-[179/825] Building CXX object absl/log/CMakeFiles/log_globals.dir/globals.cc.o
-In file included from
-/var/tmp/paludis/dev-cpp-abseil-cpp-20240722.0/work/abseil-cpp-20240722.0/absl/hash/internal/hash.h:33,
-from
-/var/tmp/paludis/dev-cpp-abseil-cpp-20240722.0/work/abseil-cpp-20240722.0/absl/hash/hash.h:85,
-from
-/var/tmp/paludis/dev-cpp-abseil-cpp-20240722.0/work/abseil-cpp-20240722.0/absl/log/globals.cc:29:
-/usr/lib/gcc/x86_64-pc-linux-gnu/15/include/g++-v15/ciso646:46:4: warning:
-#warning "<ciso646> is deprecated in C++17, use <version> to detect
-implementation-specific macros" [-Wcpp]
-46 | #  warning "<ciso646> is deprecated in C++17, use <version> to detect
-implementation-specific macros"
-      |    ^~~~~~~
-
-Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
-
-diff --git a/absl/hash/internal/hash.h b/absl/hash/internal/hash.h
-index 03bf183..3222be3 100644
---- a/absl/hash/internal/hash.h
-+++ b/absl/hash/internal/hash.h
-@@ -27,7 +27,7 @@
- #include "absl/base/config.h"
- 
- // For feature testing and determining which headers can be included.
--#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L
-+#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 201703L
- #include <version>
- #else
- #include <ciso646>
--- 
-2.47.0
-


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2025-08-01  8:10 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-01  8:10 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/files/, dev-cpp/abseil-cpp/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2025-04-05  0:42 Sam James
2024-09-08 17:16 Sam James
2024-08-07 13:04 Sam James
2024-07-13 17:10 Sam James
2023-07-05  0:40 Sam James
2022-08-23  7:30 WANG Xuerui
2022-02-07  1:58 Jason Zaman
2021-04-02  3:04 Georgy Yakovlev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox