diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-04-06 01:34:40 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-04-06 01:34:40 +0100 |
commit | 288d9455931660abb6dfa534a78d45c7fb901477 (patch) | |
tree | 20b4b716c5a7231089588a039dbdc60d93ee0980 /dev-cpp/abseil-cpp | |
parent | 8bcae5a5a332db9dc28c20b7a5f28337d8335254 (diff) |
gentoo auto-resync : 06:04:2025 - 01:34:40
Diffstat (limited to 'dev-cpp/abseil-cpp')
-rw-r--r-- | dev-cpp/abseil-cpp/Manifest | 15 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild (renamed from dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild) | 42 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild (renamed from dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild) | 44 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild (renamed from dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild) | 3 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild (renamed from dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild) | 53 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild | 100 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-ciso646-cxx17.patch | 37 |
7 files changed, 263 insertions, 31 deletions
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest index 4b4e9c4d8fcc..5bff79698d4a 100644 --- a/dev-cpp/abseil-cpp/Manifest +++ b/dev-cpp/abseil-cpp/Manifest @@ -5,6 +5,7 @@ AUX abseil-cpp-20211102.0-r2-loong.patch 739 BLAKE2B a3082b6da75719f57287dfac5b6 AUX abseil-cpp-20230125.2-musl-1.2.4.patch 2203 BLAKE2B 74ebf85e5f35de255fbf5a757655fedd8f5821558ecf700fcc06e30950ce4bb802ca2431cf8b15d05ddc3a7bf2818eec49bf38c2e33d033df0c2973983340ed4 SHA512 404a3c25135573292cbe90f3fb459172a936abc2ec4739e57b8a1dac300a3e0b848ba18aaab5f6dfd12315de736175b962174022a7969149221bf595738bebb1 AUX abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch 2148 BLAKE2B 978304f3ff8f46ac8fcd7c708f464cacf657f5f4f76a5bab5c4db6e14dcde0bbc7b2ae03c8b74a527218eab737cbacb9219b1a87ee2af8dde8795d3c1b43c7af SHA512 c94ba837440e2c49f3703492f0eb51c7f1930d8d700660d6db56985ad05fe61d3c97656ba8e0a818b843f04c939bdeb4134005420ad561068c52f64ee481f091 AUX abseil-cpp-20230802.0-sdata-tests.patch 1541 BLAKE2B ae6cebeefc794e89101bd4d0a3a1c022e651dfdb312401fbbf035f6c2afbde8162c132f692e89a075cb1811ae9e0708652c469107047cba49618c0ef752eb108 SHA512 bda7cec902c1f71173b4e7bf2e35c3fffc5de216dc84680e9a0de56b1bb5b9ea4f50cb603e690275e1fc9e2fcbc8ad998a8dadb655fb96d28a651ac80bc2f764 +AUX abseil-cpp-20240722.0-ciso646-cxx17.patch 1416 BLAKE2B b6ea4816bf9e98bc40ff6976ab2f91645db1603da63d54bf84fd36cb2eb88b5188dd88c619e945ce8e74f685cf3c3cc8b3408f8ef0ec645b13eb8c38a2ef1b56 SHA512 cb3ba482f1f1d2e7e5d426de684f8d522b483549222ff0147140766acc91a224d716e2e07e2eb0e3fc8aa042c9696bdd01eb5b5b8ec0f77e66b98c496a293bc6 AUX abseil-cpp-20240722.0-lto-odr.patch 634 BLAKE2B 33a26f207fb0ba8978188091eb32b926cf955cb4272a3afefbd9d02a9dd92f05d0f6bc571540c1c8c18e46c35b19d5ad4db395bc5b63fab21ae7adb5054f208c SHA512 bb9629d746d400ad785e3c12bbc213505c364ebbf3668af46e6cfbf83cca9b8d221c5ecca1d3646241bd2e3369d4ca956b03e404646d0e7e3de0308c27f59578 AUX abseil-cpp-atomic.patch 494 BLAKE2B bce1f9e400b495f11652743754b8120736ee043c18b2ef8f1d89d676e6dd0cc014df8d1050d9ea17c628b8c05aeb0de143b384e62fbab4675a573c4b8f53e0a4 SHA512 887e8bffca7acfa94f0e72f7f22319c365f31b55f94da155672b610bf6e4013fa73df5a7d9c8179f2d9f23926aca190f113b971ee073b36d464d60f45223fef4 AUX abseil-cpp-include-cstdint.patch 1268 BLAKE2B 693dae2368d0a816950e69fa7323437734dee1bae844f9abd957f136686a711b8d8ef92fb55c9910905e2633ccf82dd107c209f53082d1202127c444c54697ac SHA512 72f8461db4ac35a285a782eea9b70f3c387eee07804842f1880c91fa3dc32c19319462a839b2657cdd9f632868d866e5c6cac7fd5b801ac4434073d824d8729d @@ -14,20 +15,26 @@ 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 EBUILD abseil-cpp-20211102.0-r2.ebuild 1812 BLAKE2B 3e8b5486a5b9817c089cae614e17c7f095d5b4067af9c9da5fb98eeba772b41f154312f67789391a72267f3a2fa7a1062623b312bbf9b391c8b79069d20af853 SHA512 be4eae4177d0817871aee1a4b43d91f766e8186b26e8cda153c04e5894c3943764d86440f09a6177ead172c73706cd68f4be4c61b0e612ad3fbd6ce08ffcf1b5 EBUILD abseil-cpp-20220623.1.ebuild 1732 BLAKE2B 8134bcb040be826b4f153afddc4c3aae86fd9d773afbf08b50bba323c0d067fd034c92fde3f9c15f73366e910f3641512e81cefa04bc5a9f2830d06e4b8ac3f5 SHA512 ac7802104eb66d08fdcc5904d1d9644ea1511c1f1d8bda2ba8931af6aa56ce5917d59bbb9e68354b8c4d1c38cba1507cb27420e681e3679c88d3bc9538b0e19e EBUILD abseil-cpp-20230125.2.ebuild 1693 BLAKE2B ad84c9a1b9b5983029aa5978f1fefc14700c1ffdfd4edf4a4cf2ff782d25cc339b2354a293c51d8853a6a2e0107ed3f7ea8e32685663ad760fc0245c7a4ac79c SHA512 6fe0f3a491f71fcd954201653fcf329385c738a7e43cb18adf802dc2f10c27ceb7c87e8e5303d20cce07dc1f905a5e094d6979a615b14b4cdb0cce5880b1a467 -EBUILD abseil-cpp-20230125.3-r3.ebuild 1640 BLAKE2B 534ee2c085dfb77471eb34a47491abff5a64aafc6052b3875645ed3e490acd0719855f79bc098bd9107ecc5bce406789804825a88f046d3cb47db83be1a7120d SHA512 55d1a88de4c1474c9b5e03e144a874bf15fb5f9b198a188f267d1290d9f92b7ba47106751d0ba6993b87436c49aa2a744d82edd32ee1235e21f6140c57289245 EBUILD abseil-cpp-20230125.3-r4.ebuild 1711 BLAKE2B 801637ded0d238591b0f6fc581e9640424def79d6a5c6414060254e105ef0fda1ea15815f25b23b0894c67fc0132e9ec1aaf1af10823df38f6b653499221c05d SHA512 81bb4091ffe42841581d2bca66528d23ca831ff4fc1b0fd76c6f8ba16dbadab558be4b9772af802a799ea9d50089e3150009b32fb62b23b5c298111ce30c73d2 EBUILD abseil-cpp-20230125.3-r5.ebuild 1764 BLAKE2B 8c2ec49ea1596ad8f971414d06d8d957e1eebf26858868e95ec82fab990174817e21530aa0969aef024297819fe24658f7a07ad6cf5c336e120e88d961b878f8 SHA512 b685bcd81ee099888290d7111d4ddd7cd413cb191a59667dc5c2a57b1e2f0358525c8f3c222a24b7fce0a66e17da88020d97e26e5900d91b95ce1abbe597cf2a -EBUILD abseil-cpp-20230802.0-r3.ebuild 1718 BLAKE2B 1a46df3f2b8631c4cc5da5697494999329b85a0469e64f00ff2103425218086c7317594c2d4ae7e49e91fc1e636b782490825c94a01155d0bc4f72bff6e2a72b SHA512 bdbb13ac0faa4ccf7f7a41579311a65853916e7d533a107a84506dcc5463621ba5cc1ebcd1a41e01da5621c98ac4aaae0803175b0a74a02fc8af547afd8d9cbe EBUILD abseil-cpp-20230802.0-r4.ebuild 2020 BLAKE2B c29d5683173e4f720a799446bac5ec041985e633a70f1c239edc7c54dffb4b9fcafec366ace8fe3c62a686b4f2dde58313500dffdd024b08af54b45cf661edd6 SHA512 f05658f83346bccbc0e0fc86ccd3750f8ddef863328308d6bf5fe4f03a5e1316e1b4a3231218f3a7094a959ba74b7dce32b136602a505091c2b607707d060073 -EBUILD abseil-cpp-20240116.2-r3.ebuild 1718 BLAKE2B 1a46df3f2b8631c4cc5da5697494999329b85a0469e64f00ff2103425218086c7317594c2d4ae7e49e91fc1e636b782490825c94a01155d0bc4f72bff6e2a72b SHA512 bdbb13ac0faa4ccf7f7a41579311a65853916e7d533a107a84506dcc5463621ba5cc1ebcd1a41e01da5621c98ac4aaae0803175b0a74a02fc8af547afd8d9cbe +EBUILD abseil-cpp-20230802.3.ebuild 2156 BLAKE2B bf1f6ef63f38a71fe6fd0d36330b2609a2fdae6b912ce17671d12cb8230524796b49b6520b6cb7697aa7894407ea2e9fc60d29fcbd1652d407204cd3a20b3c17 SHA512 30cba932014f03c08e9934f3a9fd4ef15dbd0f870469e27d5e488154696353ab74aff6bacc24bd4d2f8da83baf0946234d136648d4a387950e2e5dc699239f47 EBUILD abseil-cpp-20240116.2-r4.ebuild 2054 BLAKE2B 4c3d16b79cdb84a2e40f8640dba22887be98d6b4e02733812fca4a07192380dcb57111c30dc2f15c0f560d4817e341de7bc26b6acd70aceafb532c078775cf90 SHA512 cbace15d0e28c45c88e9d833df30d53ad746f41be878110205f6faf221d45f906b20da97275ace060654fdfa3cbe836b6fad2ab22c186e66d7c016184a41244f -EBUILD abseil-cpp-20240722.0.ebuild 1996 BLAKE2B ae0416c56e1eb002263b59ebb8aaa3f65a4e08364a51e5b85a8cb38fa73434ca9057db4233769747ef30da346dfc57f9cdd0c91cbe8bf0066af1f910eae31614 SHA512 540c5dded4e00f2443ae750bdad052f98ae09871aaeda969282b0119ef371db038b69aac233238ebaeab431811ebea642b177e7586b35fde892d4fcec66f5d2a +EBUILD abseil-cpp-20240116.3.ebuild 2194 BLAKE2B 4b1b33394542a5549d41ccbb9d0b726935c2b519e1167beeffd4098f28893da20c7500c536935e1b86366d76480491a4119977faf7c59558222de27d1df98d7c SHA512 72b7caff9b133ac49bbfdabdbfe5e109335b40d2eb695f69aa24ef26a2015091786f6584ff9f3058648a632e95c68dfdf7ff60cefb241994976c05736b98ff99 +EBUILD abseil-cpp-20240722.0-r1.ebuild 2019 BLAKE2B 5a8147f4ac0caf7bd564974e6ac80593c716c8a36de2b2bef02cb66662581f11690bd8e95937980e9836c60fc875d5d3b90dab6c7f281e8a93a29df73154b813 SHA512 f2263734c9e3f6b26a0775de3e7f9e70dd54c66d6d1acf7b300c7b31f762f973a1006a08aa96f950128c686acac7ba74b749a6079b67a295bc6a7f8775f6d6ac +EBUILD abseil-cpp-20240722.1.ebuild 1973 BLAKE2B ff5921ec65ccf3c01e0ecc6c8aaecfce870977f06c15d1787eb939e4ffcc72cdd364ed23c166b0b2935252a67ddf63449602456aa6b625ae7839e96d73c1a966 SHA512 83c67e389dae155fdd55b46b3e4a8df459f9bfccc3c6d625a4803d045f03c169654682d1291fb88c14e3dab5e132f3e0ac0d5035947531acdde9c4eca4f31ce3 +EBUILD abseil-cpp-20250127.0.ebuild 2107 BLAKE2B f3bf7169bab176cc823fccfecadde9ee0785a08285b5c1be830ba349619eac0d34eea623dae8ad2e5e080a989ab3a5d73f065d058b23d7d3439fad509e92900f SHA512 afead762bb7949f7242d2146eca4c60ff136118b75d05e190fd5041d0779f201bdac329a07e95692715cd5bf02f3bcd54746118922c500882a1ff8f90680a170 MISC metadata.xml 511 BLAKE2B 368361dc6f2e55afb5af3623635272b5a7ec9444a09e7fd0be2879a7dfa2e168c0a1b994d84878a6cd422423103f317b20b543aa11ca00656199e2d3a3a4bad7 SHA512 fc164cafaca7a59e4891a1f5c7f93f790c4b163c0310cbb915f9450de023296d8ed440a89a51230aa9869c70ed55a2b1c54ca3579761cd880df9bccbbde801fd diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild index dc13dfe5045f..dd1810a5fe1a 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,11 +12,15 @@ 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%%.*}" +SLOT="0/${PV:2:4}.$(ver_cut 2).0" 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} @@ -31,17 +35,22 @@ 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" + "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" ) src_prepare() { cmake_src_prepare + use ppc && eapply "${FILESDIR}/${PN}-atomic.patch" + # un-hardcode abseil compiler flags sed -i \ -e '/"-maes",/d' \ -e '/"-msse4.1",/d' \ -e '/"-mfpu=neon"/d' \ -e '/"-march=armv8-a+crypto"/d' \ + -e '/NOMINMAX/d' \ absl/copts/copts.py || die # now generate cmake files @@ -58,10 +67,31 @@ 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_TESTING=$(usex test ON OFF) - $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. + -DABSL_BUILD_TEST_HELPERS="$(usex test)" + -DABSL_BUILD_TESTING="$(usex test)" ) + # intentional use, it uses both variables for tests. + if use test; then + mycmakeargs+=( + -DBUILD_TESTING="yes" + ) + fi cmake_src_configure } + +multilib_src_test() { + if ! use amd64; then + CMAKE_SKIP_TESTS=( + absl_symbolize_test + ) + + if use ppc; then + CMAKE_SKIP_TESTS+=( + absl_failure_signal_handler_test + ) + fi + fi + + cmake_src_test +} diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild index dc13dfe5045f..9f5cd6299aed 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2024 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,11 +12,15 @@ 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: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}]" +RDEPEND=" + test? ( + dev-cpp/gtest:=[${MULTILIB_USEDEP}] + ) +" DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} @@ -31,17 +35,22 @@ 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-ciso646-cxx17.patch" ) src_prepare() { cmake_src_prepare + use ppc && eapply "${FILESDIR}/${PN}-atomic.patch" + # un-hardcode abseil compiler flags sed -i \ -e '/"-maes",/d' \ -e '/"-msse4.1",/d' \ -e '/"-mfpu=neon"/d' \ -e '/"-march=armv8-a+crypto"/d' \ + -e '/NOMINMAX/d' \ absl/copts/copts.py || die # now generate cmake files @@ -58,10 +67,31 @@ 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_TESTING=$(usex test ON OFF) - $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. + -DABSL_BUILD_TEST_HELPERS="$(usex test)" + -DABSL_BUILD_TESTING="$(usex test)" ) + # intentional use, it uses both variables for tests. + if use test; then + mycmakeargs+=( + -DBUILD_TESTING="yes" + ) + fi cmake_src_configure } + +multilib_src_test() { + if ! use amd64; then + CMAKE_SKIP_TESTS=( + absl_symbolize_test + ) + + if use ppc; then + CMAKE_SKIP_TESTS+=( + absl_failure_signal_handler_test + ) + fi + fi + + cmake_src_test +} diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild index 5f35a98762e5..09f1e9456316 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.0-r1.ebuild @@ -16,7 +16,7 @@ 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" IUSE="test" -RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" +RDEPEND=">=dev-cpp/gtest-1.13.0:=[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} @@ -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-20230125.3-r3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild index c248fe6ae1a4..980635fdd36e 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020-2024 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake-multilib python-any-r1 @@ -12,11 +12,15 @@ 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" +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" IUSE="test" -RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" +RDEPEND=" + test? ( + dev-cpp/gtest:=[${MULTILIB_USEDEP}] + ) +" DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} @@ -28,19 +32,24 @@ BDEPEND=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218 - "${FILESDIR}"/${PN}-random-tests.patch #935417 + "${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() { cmake_src_prepare + use ppc && eapply "${FILESDIR}/${PN}-atomic.patch" + # un-hardcode abseil compiler flags sed -i \ -e '/"-maes",/d' \ -e '/"-msse4.1",/d' \ -e '/"-mfpu=neon"/d' \ -e '/"-march=armv8-a+crypto"/d' \ + -e '/NOMINMAX/d' \ absl/copts/copts.py || die # now generate cmake files @@ -50,17 +59,35 @@ 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_TESTING=$(usex test ON OFF) - $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. + -DABSL_BUILD_TEST_HELPERS="$(usex test)" + -DABSL_BUILD_TESTING="$(usex test)" ) + # intentional use, it uses both variables for tests. + if use test; then + mycmakeargs+=( + -DBUILD_TESTING="yes" + ) + fi cmake_src_configure } + +multilib_src_test() { + if ! use amd64; then + CMAKE_SKIP_TESTS=( + absl_symbolize_test + ) + + if use ppc; then + CMAKE_SKIP_TESTS+=( + absl_failure_signal_handler_test + ) + fi + fi + + cmake_src_test +} diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild new file mode 100644 index 000000000000..896be16ff5ca --- /dev/null +++ b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild @@ -0,0 +1,100 @@ +# Copyright 2020-2025 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 + 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" +IUSE="test" + +RDEPEND=" + test? ( + dev-cpp/gtest:=[${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}-20240722.0-lto-odr.patch" + "${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch" + "${DISTDIR}/${PN}-20250127.0-PR1834.patch" +) + +src_prepare() { + cmake_src_prepare + + use ppc && eapply "${FILESDIR}/${PN}-atomic.patch" + + # un-hardcode abseil compiler flags + # 942192 + sed -i \ + -e '/NOMINMAX/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="$(usex test)" + -DABSL_BUILD_TESTING="$(usex test)" + ) + # intentional use, it uses both variables for tests. + if use test; then + mycmakeargs+=( + -DBUILD_TESTING="yes" + ) + fi + + cmake_src_configure +} + +multilib_src_test() { + if ! use amd64; then + CMAKE_SKIP_TESTS=( + absl_symbolize_test + ) + + if use ppc; then + CMAKE_SKIP_TESTS+=( + absl_failure_signal_handler_test + ) + fi + 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 + |