public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/
@ 2021-04-04 21:59 Georgy Yakovlev
  0 siblings, 0 replies; 11+ messages in thread
From: Georgy Yakovlev @ 2021-04-04 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     809df6d1150a72505116707581607d21f1c797ae
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun Apr  4 00:00:00 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 21:59:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809df6d1

dev-cpp/abseil-cpp: correct pkgconfig file location

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

 ...p-20210324.0-r1.ebuild => abseil-cpp-20210324.0-r2.ebuild} |  1 +
 .../abseil-cpp/files/abseil-cpp-20210324-pkgconfig_path.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild
similarity index 97%
rename from dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r1.ebuild
rename to dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild
index dd401361783..42d1d983e58 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild
@@ -36,6 +36,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
+	"${FILESDIR}/${PN}-20210324-pkgconfig_path.patch"
 )
 
 src_prepare() {

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20210324-pkgconfig_path.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20210324-pkgconfig_path.patch
new file mode 100644
index 00000000000..3ce0a0cefe0
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20210324-pkgconfig_path.patch
@@ -0,0 +1,11 @@
+--- /CMake/AbseilHelpers.cmake
++++ /CMake/AbseilHelpers.cmake
+@@ -181,7 +181,7 @@
+ Libs: -L\${libdir} $<JOIN:${ABSL_CC_LIB_LINKOPTS}, > $<$<NOT:$<BOOL:${ABSL_CC_LIB_IS_INTERFACE}>>:-labsl_${_NAME}>\n\
+ Cflags: -I\${includedir}${PC_CFLAGS}\n")
+       INSTALL(FILES "${CMAKE_BINARY_DIR}/lib/pkgconfig/absl_${_NAME}.pc"
+-              DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
++              DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+     endif()
+   endif()
+ 


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/
@ 2021-04-22  4:07 Georgy Yakovlev
  0 siblings, 0 replies; 11+ messages in thread
From: Georgy Yakovlev @ 2021-04-22  4:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e468c4e0a96a504904eab6e492f469e64aa7547b
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 22 04:07:05 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Apr 22 04:07:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e468c4e0

dev-cpp/abseil-cpp: drop 20210324.0-r2

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-cpp/abseil-cpp/Manifest                        |  1 -
 dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild | 77 ----------------------
 .../files/abseil-cpp-20210324-pkgconfig_path.patch | 11 ----
 3 files changed, 89 deletions(-)

diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 7c469f55bb1..d0ec2ff1bf7 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,5 +1,4 @@
 DIST abseil-cpp-20200225.2.tar.gz 1679650 BLAKE2B bbadb2b86fd390f51322e687526c72a3b13caff6391974462a1146cc563616ce479330336a489a71e27b143e7cbea6695fc12c91fb721185a5116b3a6c5506b1 SHA512 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335
 DIST abseil-cpp-20200923.2.tar.gz 1783972 BLAKE2B 7ba01cab353de9bf34230e0efa567b1dc16680144579841a0fd127b95fb36cc8b63fc3c7da6a0a7c350c32b91955c6b6bb23a3ca52e50174a4dce5d3c1b9e936 SHA512 fdbb0f84265bc1d4f24aac0af6d0eb8cb603f801fc14d63ac1e9d3bab47703a8a2ff5f44a0a4d325819dbea50fc533d967e1bfd65004ec11ef35fadc44a2b855
-DIST abseil-cpp-20210324.0.tar.gz 1774094 BLAKE2B 2dc2ca1adcddbcf5d18a41dda407691bc5e5613c0eeed54879b803f78146c47c222337f496d7505424d1329e3c71826269d7f621c82aa9f0e104f5b8ed73bf30 SHA512 0817d6972047e0b2e7f9575fd558f0875ba3d14828609d6262149cbcef4b86f601595338e4ba597bd6fba28b77bea6f2993002377949bc6f506da0879f9f9c9d
 DIST abseil-cpp-20210324.1.tar.gz 1774134 BLAKE2B 8dd42b3d60a38995eeeeb72ba8aaa367c3caff118d88069dba9df24b155318ffd6c4e289c263346899bf7fc0bf6e8332380407a8a93c77f8cade0e8e74743b84 SHA512 fe593ed98eeea5461abca95ebb9dd3f7e8eedaa15e009f776945fdbb6ed489c61966611c1c72558d2ccdd541b952a345e51885d522ff29542cbcc837cf565866
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild
deleted file mode 100644
index 55ba466b5c9..00000000000
--- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.0-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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 toolchain-funcs
-
-# yes, it needs SOURCE, not just installed one
-GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
-GTEST_FILE="gtest-1.10.0_p20200702.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 ~ppc64 ~x86"
-IUSE="+cxx17 test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	test? ( sys-libs/timezone-data )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
-	"${FILESDIR}/${PN}-20210324-pkgconfig_path.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() {
-	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}"
-		$(usex cxx17 -DCMAKE_CXX_STANDARD=17 '') # it has to be a useflag for some consumers
-		$(usex test -DBUILD_TESTING=ON '') #intentional usex
-	)
-	cmake_src_configure
-}

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20210324-pkgconfig_path.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20210324-pkgconfig_path.patch
deleted file mode 100644
index 3ce0a0cefe0..00000000000
--- a/dev-cpp/abseil-cpp/files/abseil-cpp-20210324-pkgconfig_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /CMake/AbseilHelpers.cmake
-+++ /CMake/AbseilHelpers.cmake
-@@ -181,7 +181,7 @@
- Libs: -L\${libdir} $<JOIN:${ABSL_CC_LIB_LINKOPTS}, > $<$<NOT:$<BOOL:${ABSL_CC_LIB_IS_INTERFACE}>>:-labsl_${_NAME}>\n\
- Cflags: -I\${includedir}${PC_CFLAGS}\n")
-       INSTALL(FILES "${CMAKE_BINARY_DIR}/lib/pkgconfig/absl_${_NAME}.pc"
--              DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
-+              DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-     endif()
-   endif()
- 


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/
@ 2021-04-29  4:05 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-04-29  4:05 UTC (permalink / raw
  To: gentoo-commits

commit:     6459947b9a21796aa2980fce0e16f25a9bb37294
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 03:02:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 04:04:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6459947b

dev-cpp/abseil-cpp: backport fix for arm64 CPUs without crypto extensions

* Backport fix for arm64 CPUs without crypto extensions
  (needed for a keywording bug).

* Add information in patch / background on the problem
  (including mentioning the need for an ebuild change,
  in case e.g. another distro tries to pick it up,
  and to remind us to try upstream it.)

* Add explicit flag-o-matic inherits accordingly.

See: 619cfe3daec298493d31030008efc12e5ebbf7ec
Bug: https://bugs.gentoo.org/778926
Bug: https://bugs.gentoo.org/766411
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild          | 13 ++++++++++++-
 dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild          |  3 ++-
 dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild             |  3 ++-
 .../files/abseil-cpp-20200923-arm_no_crypto.patch           |  7 +++++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
index 344942f1eca..a4ec361d4c0 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit cmake python-any-r1
+inherit cmake flag-o-matic python-any-r1
 
 DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
 HOMEPAGE="https://abseil.io"
@@ -23,6 +23,10 @@ BDEPEND="${PYTHON_DEPS}"
 # requires source of gtest and other libs
 RESTRICT=test
 
+PATCHES=(
+	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 
@@ -40,6 +44,13 @@ src_prepare() {
 }
 
 src_configure() {
+	if use arm || use arm64; then
+		# bug #778926
+		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
 	)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild
index a5ffd719aa2..d15b9e966d8 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit cmake python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic python-any-r1 toolchain-funcs
 
 # yes, it needs SOURCE, not just installed one
 GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
@@ -59,6 +59,7 @@ src_prepare() {
 
 src_configure() {
 	if use arm || use arm64; then
+		# bug #778926
 		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

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
index 136d41f23b4..12ecd89301f 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit cmake python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic python-any-r1 toolchain-funcs
 
 # yes, it needs SOURCE, not just installed one
 GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
@@ -61,6 +61,7 @@ src_prepare() {
 
 src_configure() {
 	if use arm || use arm64; then
+		# bug #778926
 		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

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
index b74a6c70e90..762476a1018 100644
--- 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
@@ -1,3 +1,10 @@
+Don't assume all ARM CPUs have crypto extensions.
+
+Requires an accompanying change in the ebuild to disable crypto
+extensions (by passing -DABSL_ARCH_ARM_NO_CRYPTO). This could
+be done by the build system instead in future.
+
+https://bugs.gentoo.org/778926
 --- /absl/random/internal/randen_hwaes.cc
 +++ /absl/random/internal/randen_hwaes.cc
 @@ -50,8 +50,11 @@


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/
@ 2021-06-17 17:51 Georgy Yakovlev
  0 siblings, 0 replies; 11+ messages in thread
From: Georgy Yakovlev @ 2021-06-17 17:51 UTC (permalink / raw
  To: gentoo-commits

commit:     5282497562878d60e3dfccd91702f4bdd7969baa
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 17 17:50:24 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 17:51:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52824975

dev-cpp/abseil-cpp: include limits

Bug: https://bugs.gentoo.org/786726
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild |  1 +
 dev-cpp/abseil-cpp/files/include_limits.patch      | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
index 421632ddb7a..fe5a91286a0 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
@@ -25,6 +25,7 @@ RESTRICT=test
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
+	"${FILESDIR}/include_limits.patch"
 )
 
 src_prepare() {

diff --git a/dev-cpp/abseil-cpp/files/include_limits.patch b/dev-cpp/abseil-cpp/files/include_limits.patch
new file mode 100644
index 00000000000..c64229db984
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/include_limits.patch
@@ -0,0 +1,10 @@
+--- a/absl/synchronization/internal/graphcycles.cc
++++ b/absl/synchronization/internal/graphcycles.cc
+@@ -37,6 +37,7 @@
+ 
+ #include <algorithm>
+ #include <array>
++#include <limits>
+ #include "absl/base/internal/hide_ptr.h"
+ #include "absl/base/internal/raw_logging.h"
+ #include "absl/base/internal/spinlock.h"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/
@ 2021-11-16 11:58 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-11-16 11:58 UTC (permalink / raw
  To: gentoo-commits

commit:     a6b7f9142590452d2779e12379b6ca856e236d92
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 11:58:36 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 11:58:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b7f914

dev-cpp/abseil-cpp: fix 20210324.1 build with glibc-2.34

Closes: https://bugs.gentoo.org/823990
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild            |  1 +
 .../files/abseil-cpp-20210324.1-glibc-2.34.patch           | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
index 2414ecd661e2..087d0e5ce2b8 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
@@ -36,6 +36,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
+	"${FILESDIR}/${PN}-20210324.1-glibc-2.34.patch"
 )
 
 src_prepare() {

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20210324.1-glibc-2.34.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20210324.1-glibc-2.34.patch
new file mode 100644
index 000000000000..99b868d3101f
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20210324.1-glibc-2.34.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/823990
+https://github.com/abseil/abseil-cpp/commit/a9831f1cbf93fb18dd951453635f488037454ce9.patch
+--- a/absl/debugging/failure_signal_handler.cc
++++ b/absl/debugging/failure_signal_handler.cc
+@@ -136,7 +136,8 @@ static bool SetupAlternateStackOnce() {
+ #else
+   const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
+ #endif
+-  size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
++  size_t stack_size =
++      (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
+ #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
+     defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
+   // Account for sanitizer instrumentation requiring additional stack space.


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/
@ 2021-12-26  7:21 Georgy Yakovlev
  0 siblings, 0 replies; 11+ messages in thread
From: Georgy Yakovlev @ 2021-12-26  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     63b9fbd56f01d4214b0bada55c268a69780404ed
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 07:19:41 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 07:20:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b9fbd5

dev-cpp/abseil-cpp: drop 20200225.2-r1

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-cpp/abseil-cpp/Manifest                        |  1 -
 dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild | 60 ----------------------
 dev-cpp/abseil-cpp/files/include_limits.patch      | 10 ----
 3 files changed, 71 deletions(-)

diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 87df76fc1728..9eea1b17c072 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,4 +1,3 @@
-DIST abseil-cpp-20200225.2.tar.gz 1679650 BLAKE2B bbadb2b86fd390f51322e687526c72a3b13caff6391974462a1146cc563616ce479330336a489a71e27b143e7cbea6695fc12c91fb721185a5116b3a6c5506b1 SHA512 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335
 DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
 DIST abseil-cpp-20210324.2.tar.gz 1774172 BLAKE2B f33ebe830bcece41d76c4de8f514e32a2515be8a78b6cc7a8877ba72284be62649e345dea224976e78e8dcf7fd957e249c92f7c89e92ae44e984fe294df711fc SHA512 7b935f0f2787a81438f30072f2191138ce3c099e4b22addfbe8ebe579d906604bc6ab03f054d3d6917a08ef5cb7a4371c1a501a7dfbc15c50301261dbf5f6e27
 DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
deleted file mode 100644
index fe5a91286a00..000000000000
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 flag-o-matic 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="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-# requires source of gtest and other libs
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
-	"${FILESDIR}/include_limits.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
-}
-
-src_configure() {
-	if use arm || use arm64; then
-		# bug #778926
-		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
-		-DBUILD_SHARED_LIBS=TRUE
-	)
-	cmake_src_configure
-}

diff --git a/dev-cpp/abseil-cpp/files/include_limits.patch b/dev-cpp/abseil-cpp/files/include_limits.patch
deleted file mode 100644
index c64229db984a..000000000000
--- a/dev-cpp/abseil-cpp/files/include_limits.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/absl/synchronization/internal/graphcycles.cc
-+++ b/absl/synchronization/internal/graphcycles.cc
-@@ -37,6 +37,7 @@
- 
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include "absl/base/internal/hide_ptr.h"
- #include "absl/base/internal/raw_logging.h"
- #include "absl/base/internal/spinlock.h"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/
@ 2022-06-26  2:45 Jason Zaman
  0 siblings, 0 replies; 11+ messages in thread
From: Jason Zaman @ 2022-06-26  2:45 UTC (permalink / raw
  To: gentoo-commits

commit:     5b9ba90d62157a5ef8fe991a87c51c39666f029e
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 16:24:12 2022 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 02:37:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b9ba90d

dev-cpp/abseil-cpp: Fix build with nvidia cuda11.6

also update EAPI 7 -> 8

Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild | 73 ++++++++++++++++++++++
 ...il-cpp-20211102.0-r2-cuda11.6-compile-fix.patch | 24 +++++++
 2 files changed, 97 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
new file mode 100644
index 000000000000..a987d852dee3
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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 ~arm ~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"
+	"${FILESDIR}/${PN}-20211102.0-r2-cuda11.6-compile-fix.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-r2-cuda11.6-compile-fix.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch
new file mode 100644
index 000000000000..59efc0f321e3
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch
@@ -0,0 +1,24 @@
+diff --git a/absl/strings/internal/string_constant.h b/absl/strings/internal/string_constant.h
+index a11336b..e1596b1 100644
+--- a/absl/strings/internal/string_constant.h
++++ b/absl/strings/internal/string_constant.h
+@@ -35,12 +35,18 @@ namespace strings_internal {
+ // below.
+ template <typename T>
+ struct StringConstant {
++ private:
++  static constexpr bool ValidateConstant(absl::string_view view) {
++    return view.empty() || 2 * view[0] != 1;
++  }
++
++public:
+   static constexpr absl::string_view value = T{}();
+   constexpr absl::string_view operator()() const { return value; }
+ 
+   // Check to be sure `view` points to constant data.
+   // Otherwise, it can't be constant evaluated.
+-  static_assert(value.empty() || 2 * value[0] != 1,
++  static_assert(ValidateConstant(value),
+                 "The input string_view must point to constant data.");
+ };
+ 


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

commit:     a09062248fbb0fbfdf23b5a54b4d1146d0a95556
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 15:59:42 2022 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 07:28:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0906224

dev-cpp/abseil-cpp: fix build on loong

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-loong.patch         | 18 ++++++++++++++++++
 2 files changed, 19 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 a987d852dee3..240032cfb51a 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
@@ -38,6 +38,7 @@ RESTRICT="!test? ( test )"
 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"
 )
 
 src_prepare() {

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch
new file mode 100644
index 000000000000..2031f9f33d88
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch
@@ -0,0 +1,18 @@
+https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1
+
+From 808bc202fc13e85a7948db0d7fb58f0f051200b1 Mon Sep 17 00:00:00 2001
+From: imaiguo <maaiguo@uniontech.com>
+Date: Wed, 23 Feb 2022 22:56:32 +0800
+Subject: [PATCH] Add support of loongarch64 (#1110)
+
+--- a/absl/debugging/internal/examine_stack.cc
++++ b/absl/debugging/internal/examine_stack.cc
+@@ -82,6 +82,8 @@ void* GetProgramCounter(void* vuc) {
+       return reinterpret_cast<void*>(context->uc_mcontext.gregs[16]);
+ #elif defined(__e2k__)
+     return reinterpret_cast<void*>(context->uc_mcontext.cr0_hi);
++#elif defined(__loongarch__)
++    return reinterpret_cast<void*>(context->uc_mcontext.__pc);
+ #else
+ #error "Undefined Architecture."
+ #endif


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/
@ 2023-11-20 10:06 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-11-20 10:06 UTC (permalink / raw
  To: gentoo-commits

commit:     ab3288fee25a9c80d6a25ceb79e564c85ad1cb1e
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sun Nov 19 04:44:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 10:03:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab3288fe

dev-cpp/abseil-cpp: add patch for test on .sdata platforms

See: https://github.com/matoro/abseil-cpp/commit/cc37c61553fa2a186d4abf48e97ad9df4e5d62e3
Bug: https://bugs.gentoo.org/917062
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild    |  1 +
 .../files/abseil-cpp-20230802.0-sdata-tests.patch  | 41 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild
index bf2a6afad44c..614d40121204 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0.ebuild
@@ -28,6 +28,7 @@ BDEPEND="
 "
 
 RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" )
 
 src_prepare() {
 	cmake_src_prepare

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-sdata-tests.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-sdata-tests.patch
new file mode 100644
index 000000000000..67d3a9697731
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-sdata-tests.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/show_bug.cgi?id=917062
+https://github.com/matoro/abseil-cpp/commit/cc37c61553fa2a186d4abf48e97ad9df4e5d62e3
+
+From cc37c61553fa2a186d4abf48e97ad9df4e5d62e3 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Tue, 14 Nov 2023 10:39:34 -0500
+Subject: [PATCH] symbolize_test: account for platforms with ".sdata" small
+ data sections
+
+A handful of ELF targets use a ".sdata" section for small data.  The
+default maximum size of symbols in this section as well as the gcc flag
+to change that maximum size differ between two targets.  On such
+platforms, if there is no data large enough to exceed the small data
+limit then the ".data" section will be excluded entirely.  This changes
+the check to ensure that at least one of a ".sdata" section OR a ".data"
+section is present.
+---
+ absl/debugging/symbolize_test.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/absl/debugging/symbolize_test.cc b/absl/debugging/symbolize_test.cc
+index d0feab2ffa6..1e4b5ba6105 100644
+--- a/absl/debugging/symbolize_test.cc
++++ b/absl/debugging/symbolize_test.cc
+@@ -44,6 +44,7 @@
+ #define MAP_ANONYMOUS MAP_ANON
+ #endif
+ 
++using testing::AnyOf;
+ using testing::Contains;
+ 
+ #ifdef _WIN32
+@@ -456,7 +457,7 @@ TEST(Symbolize, ForEachSection) {
+   EXPECT_THAT(sections, Contains(".rodata"));
+   EXPECT_THAT(sections, Contains(".bss"));
+   ++in_data_section;
+-  EXPECT_THAT(sections, Contains(".data"));
++  EXPECT_THAT(sections, AnyOf(Contains(".data"), Contains(".sdata")));
+ 
+   close(fd);
+ }


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/
@ 2024-07-07  0:26 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-07-07  0:26 UTC (permalink / raw
  To: gentoo-commits

commit:     a0dfb5fe757ed1482b59f14c1e5068f40b625972
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  7 00:25:07 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul  7 00:25:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0dfb5fe

dev-cpp/abseil-cpp: fix build without tests

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

 dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild    |  1 +
 dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild    |  6 +++++-
 dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild    |  6 +++++-
 .../abseil-cpp/files/abseil-cpp-random-tests.patch    | 19 +++++++++++++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild
index 46aea4f8cad5..c248fe6ae1a4 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild
@@ -29,6 +29,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218
+	"${FILESDIR}"/${PN}-random-tests.patch #935417
 )
 
 src_prepare() {

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild
index 1281eefffab0..9a9c217bda00 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild
@@ -26,7 +26,11 @@ BDEPEND="
 "
 
 RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20230802.0-sdata-tests.patch"
+	"${FILESDIR}/${PN}-random-tests.patch" #935417
+)
 
 src_prepare() {
 	cmake_src_prepare

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild
index 1281eefffab0..9a9c217bda00 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild
@@ -26,7 +26,11 @@ BDEPEND="
 "
 
 RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20230802.0-sdata-tests.patch"
+	"${FILESDIR}/${PN}-random-tests.patch" #935417
+)
 
 src_prepare() {
 	cmake_src_prepare

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-random-tests.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-random-tests.patch
new file mode 100644
index 000000000000..769ac6a56e39
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-random-tests.patch
@@ -0,0 +1,19 @@
+https://github.com/abseil/abseil-cpp/issues/1528
+
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Sat, 7 Jul 2024 01:53:19 +0200
+Subject: [PATCH] remove abseil::random_internal_mock_overload_set
+See-Also: https://bugs.gentoo.org/935417
+
+diff --git a/absl/random/CMakeLists.txt b/absl/random/CMakeLists.txt
+index bd363d8..7692a35 100644
+--- a/absl/random/CMakeLists.txt
++++ b/absl/random/CMakeLists.txt
+@@ -112,7 +112,6 @@ absl_cc_library(
+     absl::raw_logging_internal
+     absl::random_distributions
+     absl::random_internal_distribution_caller
+-    absl::random_internal_mock_overload_set
+     absl::random_random
+     absl::strings
+     absl::span


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/
@ 2024-09-04  2:32 Yixun Lan
  0 siblings, 0 replies; 11+ messages in thread
From: Yixun Lan @ 2024-09-04  2:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ef4be08b30a9e4c6b268f6d58f54d4c4c86da26a
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Aug  9 15:51:28 2024 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Sep  4 02:30:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef4be08b

dev-cpp/abseil-cpp: add 20240722.0

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 dev-cpp/abseil-cpp/Manifest                        |  1 +
 dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild    | 71 ++++++++++++++++++++++
 .../files/abseil-cpp-20240722.0-lto-odr.patch      | 30 +++++++++
 3 files changed, 102 insertions(+)

diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index e652ac7bfedf..190373fa4aab 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/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/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild
new file mode 100644
index 000000000000..ce79f7e1ba8d
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild
@@ -0,0 +1,71 @@
+# 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 ~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
+
+	# 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
+}

diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch
new file mode 100644
index 000000000000..93c07b701948
--- /dev/null
+++ b/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 <negril.nx+gentoo@gmail.com>
+Date: Fri, 30 Aug 2024 02:14:26 +0200
+Subject: [PATCH] lto odr
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+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
+


^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-09-04  2:32 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-04 21:59 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/, dev-cpp/abseil-cpp/files/ Georgy Yakovlev
  -- strict thread matches above, loose matches on Subject: below --
2021-04-22  4:07 Georgy Yakovlev
2021-04-29  4:05 Sam James
2021-06-17 17:51 Georgy Yakovlev
2021-11-16 11:58 Sam James
2021-12-26  7:21 Georgy Yakovlev
2022-06-26  2:45 Jason Zaman
2022-08-23  7:30 WANG Xuerui
2023-11-20 10:06 Sam James
2024-07-07  0:26 Sam James
2024-09-04  2:32 Yixun Lan

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