From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 May 2021 22:28:33 +0100 Subject: gentoo resync : 04.05.2021 --- dev-cpp/abseil-cpp/Manifest | 10 +-- dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild | 14 +++- dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild | 75 --------------------- dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild | 77 ++++++++++++++++++++++ dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild | 7 +- .../files/abseil-cpp-20200923-arm_no_crypto.patch | 7 ++ 6 files changed, 106 insertions(+), 84 deletions(-) delete mode 100644 dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild create mode 100644 dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild (limited to 'dev-cpp/abseil-cpp') diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest index bde44a83fc3f..caba6e71a69c 100644 --- a/dev-cpp/abseil-cpp/Manifest +++ b/dev-cpp/abseil-cpp/Manifest @@ -1,9 +1,9 @@ -AUX abseil-cpp-20200923-arm_no_crypto.patch 782 BLAKE2B 88d68fee79064727b32f8468d9f985ed7546ce632b36526ecf6e1b34acfe01910e92fd3dd9901dceabc65614057bc76b14104afba75d21171e62f83d58fb1b51 SHA512 2ca48562f8296f81af0b61eb700e60f5b0c9a59290a472f98a7316034300a0424c5a6e7119d16710eabcfd424ad80b585318571f17fe316d88aa9ee2ba34f04a +AUX abseil-cpp-20200923-arm_no_crypto.patch 1038 BLAKE2B 2443144b968f22e29503fb4a58ac45b623c104d298445b68b5ab34a5a08a5398a9b16cf6563e3127dfc4ba7ed211d53c2e1fb8f72fb120749065dce77fb67158 SHA512 5e2c192379d7190d97065973861d76e3680728a2e723c7cfb8b9ead4e02c94c3b12061c75f2f619cf1c9c217c3f29eaa36b59ff73e23417bf56f600a97128ff3 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-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85 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 -EBUILD abseil-cpp-20200225.2-r1.ebuild 968 BLAKE2B c873e52fcc15eabf024db55ae332e6997e60c65188bece3cace092de1e0b356072dd6b718ee129974110facc9eb76ca221e66423a643d3e78a2a5625f00b267c SHA512 0e7c2697c8955ab03566b3405131e352e234644ec7310d587edd5c3b07aa11ab0360ca229f5c77cc4b234b70130f77f8ec637c19e1d9ebcac2cf428b89a35ee4 -EBUILD abseil-cpp-20200923.2-r1.ebuild 1923 BLAKE2B b1d33772e9c63060d7f5b4745d71e2ebebe090a36bfec4c934d14c04766fec1fc2997a48c9dc5948a417fa3821b6bf84c4ccddcfdb15e6abd3bc8cff339f67e1 SHA512 63ac983d95e592858131e6771efc61deb0c3e8b010bf4ebd139a9b3158512b0a6e116ca40e56874f5e6e49a5734916ae3bffeb569e68600d2dcf7afe4c19d635 -EBUILD abseil-cpp-20210324.1.ebuild 1926 BLAKE2B f197fe665b05a29a62f1f21874e15e27cd0c4b40326e69a9ecce320d32984dcf3ca0bb85a917e198aea818cf0cb63713b5151669f5352f1e570fa6a7f1274295 SHA512 4c73a8f2c02df6df96d65e2ad51a59eeacafdf06c76192e8af396ed9fa818d7bd76f65d045e7b8bdf1c381d29f7ed1be5ff0140858969f217f972e375b20ba33 +EBUILD abseil-cpp-20200225.2-r1.ebuild 1328 BLAKE2B f22f3a772e78085319e04793d4c6720d5bff17fb5af221db3f76d847eb0a360bc0b23025cc3a6d2a6251b8462750826b20e1c804ead6d7923e813a76e5a23de7 SHA512 129c56641a5ff1e6d1f3047786b06b0b9a8daa18b38af360835b22589039961815165fa0a07aab94413a93e250fbe56b8c2b277961712e451a860d5a2d47922d +EBUILD abseil-cpp-20200923.3.ebuild 1979 BLAKE2B 99049668df386c2f2f754c513921a4106c13e5a57a90aa62a8c84eeb14ca5fe664505aae9f871d3d02df8848c9051f82f63b5b85a42c2d8543831022b68f8f43 SHA512 0d9958d85dd3ba91d6bcfcda4f59676b4a3c281c80842612c8e835ab4f91f6fcc35fedcb5611080a8fc093a46d49ef47bcca7a791872452adb7d16c3cc5be3e8 +EBUILD abseil-cpp-20210324.1.ebuild 1887 BLAKE2B cb5445c3be46ab7eed9451e40a9e04a6514955b9517727f060686c5e022a96d648df8794605d38ad3e3b8d46b531de523d2b75a3facea7137848f3d4753046da SHA512 ec9dab5feabf0c6354227361ee78a8ec7befa239aecd2d6d76e815fc3dd765a90cc021541a099fc84564edf73f0f4e462abdca2186a81aa3751917cf78130005 MISC metadata.xml 356 BLAKE2B 192cd53686f89cf886b3dccd4d3c64dd44912c3572c3ec16c786c81c62b5ad1090be7c6e43bf2900d731ca72804f57f17d2eef619b88932d14423e72363e61b2 SHA512 39f66dcee864111412707467b6757811eeb9ddb24cb23bd3ff01b9426dff922fbd69312fda9142e03df146c22cd2b5fc1b06249cd1b6c334b076b798721fdca2 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 344942f1ecaa..cd83b6c48f55 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,8 +44,16 @@ 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 + -DBUILD_SHARED_LIBS=TRUE ) cmake_src_configure } diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild deleted file mode 100644 index a5ffd719aa27..000000000000 --- a/dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild +++ /dev/null @@ -1,75 +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 - 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 ~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" -) - -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 - - sed -i 's/-Werror//g' \ - "${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die -} - -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}" - -DABSL_RUN_TESTS=$(usex test) - $(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/abseil-cpp-20200923.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild new file mode 100644 index 000000000000..a215a3844394 --- /dev/null +++ b/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild @@ -0,0 +1,77 @@ +# 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 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 + 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 ~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" +) + +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 + + sed -i 's/-Werror//g' \ + "${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || 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 + -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" + -DABSL_RUN_TESTS=$(usex test) + -DBUILD_SHARED_LIBS=TRUE + $(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/abseil-cpp-20210324.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild index 136d41f23b4d..f251363fd3dd 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" @@ -22,7 +22,7 @@ LICENSE=" " SLOT="0/${PV%%.*}" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="+cxx17 test" +IUSE="test" DEPEND="" RDEPEND="${DEPEND}" @@ -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 @@ -69,7 +70,7 @@ src_configure() { 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 + -DCMAKE_CXX_STANDARD=17 $(usex test -DBUILD_TESTING=ON '') #intentional usex ) cmake_src_configure 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 b74a6c70e904..762476a10184 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 @@ -- cgit v1.2.3