diff options
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/abseil-cpp/Manifest | 2 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild | 14 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild (renamed from dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild) | 4 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild | 4 | ||||
| -rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch | 7 | ||||
| -rw-r--r-- | dev-cpp/notcurses/Manifest | 4 | ||||
| -rw-r--r-- | dev-cpp/notcurses/notcurses-2.2.8.ebuild (renamed from dev-cpp/notcurses/notcurses-2.2.3.ebuild) | 6 |
7 files changed, 32 insertions, 9 deletions
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest index d0ec2ff1bf7c..6e9128b98ae8 100644 --- a/dev-cpp/abseil-cpp/Manifest +++ b/dev-cpp/abseil-cpp/Manifest @@ -1,4 +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-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 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 8dba7476a7fb..dc5e0d4746ac 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_{6,7,8,9,10} ) -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.3.ebuild index 0be635f28780..d065aeae4e63 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20200923.2-r1.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -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 @@ -68,6 +69,7 @@ src_configure() { -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 ) diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild index ce80ea9eddd0..beb95edfed77 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_{6,7,8,9,10} ) -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 @@ -69,6 +70,7 @@ src_configure() { local mycmakeargs=( -DABSL_ENABLE_INSTALL=TRUE -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" + -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 ) 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 @@ diff --git a/dev-cpp/notcurses/Manifest b/dev-cpp/notcurses/Manifest index 44dc9a74987b..1534de2f89c3 100644 --- a/dev-cpp/notcurses/Manifest +++ b/dev-cpp/notcurses/Manifest @@ -1,2 +1,2 @@ -DIST notcurses-2.2.3.tar.gz 10861361 BLAKE2B e7b487e84b5defbb1208f355c85f7178b05f412c2a746a8bcecb2da7db8df32da563aeb1f1f218014a2ff9803f0984889e4341d59f585add49c944d4707e5cd4 SHA512 9c718a39352cc10e4f4cb24cd7940ccc7ac7ad1f5890f1a87166267b3c24011629464a4720f08c2b8bbf0fab2c5cb9b31fba7a43bc62ae65dff894019adece7d -DIST notcurses-doc-2.2.3.tar.gz 89550 BLAKE2B a42c74f95166e48ecff99a05d66925869a44a44c4faa867cca663d94ee340748417d6560d022fdb90c7761c19285b0c4838b75843a3d26d25182977f68a0d6ce SHA512 b61f829d1ad5f69147a7b4fe139db406d5a26683b55d72251f3e313c17f591ad4e9e868577fbecf86c4ac9959c942e244927fb29a2e44996fadde7946493ccc8 +DIST notcurses-2.2.8.tar.gz 11255362 BLAKE2B d56f48ecfcfc107d696bb1da029afba8c8a29ea6f0d6317ccdd42d895d890c0cc1d46120566c2f60bd554c2a57aa60409276632216608b29469421a1c22cecf2 SHA512 7455ad1dfbeda68a0b2c35ba3bb28eab3bc0be1ca4db12ce0e3662cf12f1e541dec506c9896624f77ef8032ae6b644ee85ac5abf2272f54fb1c9038b33214892 +DIST notcurses-doc-2.2.8.tar.gz 115654 BLAKE2B c770f81a3ad4071f75e84caaa4370f26e68ced2489586ae857a8e3c2cf998e0d7b5d84b8fd09150ace51898731150e499f648ad2e6d5be442df11c648ba58ccd SHA512 1a2c8931bd4f68dfdd2fa921d06b639d5fa382d826d5c9e0186b4d0160f220f3f32b1eb19f17136c4d452c8afd9f6fff1b4f463a11d847ef9216ddb94b5c8ab8 diff --git a/dev-cpp/notcurses/notcurses-2.2.3.ebuild b/dev-cpp/notcurses/notcurses-2.2.8.ebuild index 9715255eb4f2..db8a559116e6 100644 --- a/dev-cpp/notcurses/notcurses-2.2.3.ebuild +++ b/dev-cpp/notcurses/notcurses-2.2.8.ebuild @@ -14,9 +14,9 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="dev-libs/libunistring:= +DEPEND="dev-libs/libunistring media-video/ffmpeg - >=sys-libs/readline-8.0:=" + >=sys-libs/readline-8.0" RDEPEND="${DEPEND}" src_configure() { @@ -45,6 +45,6 @@ src_install() { # x.y.1 or x.y.3, to install the source dir as a man page. # exploit the fact that there's a bijection from html<>man. for i in ../*.html ; do - doman ../$(basename ${i} .html) + doman ../$(basename ${i} .html || die) done } |
