diff options
Diffstat (limited to 'dev-cpp/catch')
| -rw-r--r-- | dev-cpp/catch/Manifest | 4 | ||||
| -rw-r--r-- | dev-cpp/catch/catch-1.12.2-r1.ebuild | 44 | ||||
| -rw-r--r-- | dev-cpp/catch/catch-1.9999.ebuild | 8 | ||||
| -rw-r--r-- | dev-cpp/catch/files/catch-1.12.2-glibc-2.34-sigstksz.patch | 67 |
4 files changed, 118 insertions, 5 deletions
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest index 8dfc59814442..d77f71c9a057 100644 --- a/dev-cpp/catch/Manifest +++ b/dev-cpp/catch/Manifest @@ -1,8 +1,10 @@ +AUX catch-1.12.2-glibc-2.34-sigstksz.patch 2667 BLAKE2B 890af64dcf7fb85d02a00d22b3c297ffcf6c6cc5ce4ef21310cdc030587cb2d26841040ae73a15bca0c86be1813de49667904648baf89df34779fb6e97b18e19 SHA512 bc524945b7570fad29482bafdc0f7d35a180dc3a000a5e2cdc14c5fbc54684cabfa0448d53418c122a99fca6955fda5afbac25c46fc1e7c6aa16f4ad687bac76 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844 DIST Catch2-2.13.6.tar.gz 659811 BLAKE2B d876c51589259ef9fa9640811c17049ee5f1559a2863d146b0d8f79e9531b3528db34bc23e4fee090436a92b430756442eee4820083e71225da0f24399131a73 SHA512 f63e240994b5982cf019a33b8999b62237cce174962f00437d64fd287b34f7217d066225d99322431ef60da67b025f36db703dab94b3d58bbd81095d98917278 DIST Catch2-2.13.7.tar.gz 661014 BLAKE2B 7d874832082db74895bfd696c409a77693ae68c456d1287acf965ec6884c323cd2f3bc4b9eecc3e8210d262a6da8e897dfef09ec035f8bed4d408a28e7147cc5 SHA512 1c3cbdecc6a3b59360a97789c4784d79d027e1b63bdc42b0e152c3272f7bad647fcd1490aa5caf67f968a6311dc9624b5a70d5eb3fbc1d5179d520e09b76c9ed +EBUILD catch-1.12.2-r1.ebuild 889 BLAKE2B dcc10c4f7ac2ed34d0730b9fd7bfc5cd21eb6d1f5326a8a3a1d712f6525620aaebb56927f81c62b10c9094b9b2f6ef04f843458fe594af5c6066552ad3ea845f SHA512 4d8d7cca3f745ac8094c4a585d61881a3de3ebb91413f226a0fed59d4d57ec8aa1a4b808f419610849466136c53c3ac9b742a558f91b7845fd0e664e947ac9ed EBUILD catch-1.12.2.ebuild 822 BLAKE2B 52621e2c55af3d4591bace41a4c21a49bd4e19a94685f7bcdc5214fbc9765ad3f0105fb5181e080b413f644dc572c2d283354d6b41a2ef3d5bde24a7cf9694d3 SHA512 8d8985429614e0276c5e3a95406bb363b0e405fd670bf078af9edc598fc5d1a8cd22703bf6b02a2fdf7a7de533e064f5b8824a6903e5707fc70df140d7daa8ed -EBUILD catch-1.9999.ebuild 812 BLAKE2B 9b65c1ee08f9a4b25bdf2f2e8961e725902936cd9818c6227459493e53b771ffc2a4c396fd40f3feec715d95c2fa901ccee8c4f42680d2da08d058c0701fad1e SHA512 c3766bec94da74b8a4e2e54078e1b6b71db5a5403865123798ac00584e57fb8ebc6e29db40e5e426aebef26929ec1b89c997f717d2b6b4bc6e218f04c19b4832 +EBUILD catch-1.9999.ebuild 794 BLAKE2B 905f186ecb29ac1d24caeb62b50c3d2fa9f66753a5e67dafe629a0e75dd1f97e59bf9296e3ecbec7e9dfe40ea7f3ceabb892a2397dc920ab021ffdf356b17aa7 SHA512 3f19e38f17bdda9dec4362ac063f1d542b7d97bce48e0c854a8adf4aba12cd745c2dda6be6f2cddc5ef0b93d4eb72bdf09a14ab66764fc78c6330d3da5d5b01e EBUILD catch-2.13.6.ebuild 910 BLAKE2B fef5a8ee3771f072401f0d5af0805dee98ea1b84a6ebaeaa9e59a7c97a7d5a3da9d202b092a50eeaeb865308029f7c9f77bc4d25e5a09e1a0bd9724f0ae03edf SHA512 3dc06f4b01fea561422692e27fc55389da99f0860931b8bc40b581db74488921d5e22a169eb4011ac855bab94d1504b12b407ce54db14020a22aab6ec5801aea EBUILD catch-2.13.7.ebuild 919 BLAKE2B ab3f43e428fddc1488c25ec3a0ba27dedb4514dd33a486dc138b918771e50e8e5301b52296597454dbd04bb176e0b21db8ea79f8975794059f2bd32ea3954d5f SHA512 b47f064c75c197a5272cb25a7544b11293636e44876b2b2a6afc439d53fe2c5314bc437235ce453ffcd887881c31ad86ab8d5ca2a862cad916c1beec61b19995 EBUILD catch-9999.ebuild 929 BLAKE2B dab69a496e41ace27c41efa0e48567b945ccaa2cef1089dfc5acf09f16260c6dab24dcbf1e5653740dd4f956cf0613822718cdd579d0bef08ef94c41cc5b0089 SHA512 235ac11bd0b91c18f92e2be38b0073c8b6dda575c6aaff4938821f7d1f6b38a2a44363ab30351bf3a64afa60850aee35738e72f209aef9bbde45ba88a82646c1 diff --git a/dev-cpp/catch/catch-1.12.2-r1.ebuild b/dev-cpp/catch/catch-1.12.2-r1.ebuild new file mode 100644 index 000000000000..d458ced709de --- /dev/null +++ b/dev-cpp/catch/catch-1.12.2-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/catchorg/Catch2.git" + EGIT_BRANCH="Catch1.x" +else + MY_P=${PN^}-${PV} + SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" + KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86" + + S="${WORKDIR}/${PN^}2-${PV}" +fi + +DESCRIPTION="Modern C++ header-only framework for unit-tests" +HOMEPAGE="https://github.com/catchorg/Catch2" + +LICENSE="Boost-1.0" +SLOT="1" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="!<dev-cpp/catch-1.12.2:0" + +PATCHES=( + "${FILESDIR}"/${PN}-1.12.2-glibc-2.34-sigstksz.patch +) + +src_configure() { + local mycmakeargs=( + -DNO_SELFTEST=$(usex !test) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + dodoc -r docs/. +} diff --git a/dev-cpp/catch/catch-1.9999.ebuild b/dev-cpp/catch/catch-1.9999.ebuild index 3514580992a3..9b275ede9827 100644 --- a/dev-cpp/catch/catch-1.9999.ebuild +++ b/dev-cpp/catch/catch-1.9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils +inherit cmake if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -31,10 +31,10 @@ src_configure() { local mycmakeargs=( -DNO_SELFTEST=$(usex !test) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install dodoc -r docs/. } diff --git a/dev-cpp/catch/files/catch-1.12.2-glibc-2.34-sigstksz.patch b/dev-cpp/catch/files/catch-1.12.2-glibc-2.34-sigstksz.patch new file mode 100644 index 000000000000..3c6e08384a5b --- /dev/null +++ b/dev-cpp/catch/files/catch-1.12.2-glibc-2.34-sigstksz.patch @@ -0,0 +1,67 @@ +https://src.fedoraproject.org/rpms/catch1/raw/rawhide/f/catch1-sigstksz.patch +https://bugs.gentoo.org/803962 + +commit 34650cd9ea2f7e4aa1e61b84ecf9913b87870680 +Author: Tom Hughes <tom@compton.nu> +Date: Fri Feb 19 10:45:49 2021 +0000 + + Patch for non-constant SIGSTKSZ + +--- a/include/internal/catch_fatal_condition.hpp ++++ b/include/internal/catch_fatal_condition.hpp +@@ -136,7 +136,7 @@ namespace Catch { + static bool isSet; + static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; + static stack_t oldSigStack; +- static char altStackMem[SIGSTKSZ]; ++ static char altStackMem[32768]; + + static void handleSignal( int sig ) { + std::string name = "<unknown signal>"; +@@ -156,7 +156,7 @@ namespace Catch { + isSet = true; + stack_t sigStack; + sigStack.ss_sp = altStackMem; +- sigStack.ss_size = SIGSTKSZ; ++ sigStack.ss_size = 32768; + sigStack.ss_flags = 0; + sigaltstack(&sigStack, &oldSigStack); + struct sigaction sa = { 0 }; +@@ -188,7 +188,7 @@ namespace Catch { + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; + stack_t FatalConditionHandler::oldSigStack = {}; +- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; ++ char FatalConditionHandler::altStackMem[32768] = {}; + + + } // namespace Catch +--- a/single_include/catch.hpp ++++ b/single_include/catch.hpp +@@ -6540,7 +6540,7 @@ namespace Catch { + static bool isSet; + static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; + static stack_t oldSigStack; +- static char altStackMem[SIGSTKSZ]; ++ static char altStackMem[32768]; + + static void handleSignal( int sig ) { + std::string name = "<unknown signal>"; +@@ -6560,7 +6560,7 @@ namespace Catch { + isSet = true; + stack_t sigStack; + sigStack.ss_sp = altStackMem; +- sigStack.ss_size = SIGSTKSZ; ++ sigStack.ss_size = 32768; + sigStack.ss_flags = 0; + sigaltstack(&sigStack, &oldSigStack); + struct sigaction sa = { 0 }; +@@ -6591,7 +6591,7 @@ namespace Catch { + bool FatalConditionHandler::isSet = false; + struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; + stack_t FatalConditionHandler::oldSigStack = {}; +- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; ++ char FatalConditionHandler::altStackMem[32768] = {}; + + } // namespace Catch + |