diff options
| author |   Sam James <sam@gentoo.org> | 2022-09-24 00:15:07 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-09-24 00:17:07 +0100 |
| commit | 3194d18b9e7a583b3dc764bd1fdceada10417859 (patch) | |
| tree | bb053569a42e4b1cc94781c21a72a60e53a12a42 /net-misc/openssh | |
| parent | net-misc/openssh: block older gcc-config w/o ${CTARGET}-cc (diff) | |
| download | gentoo-3194d18b9e7a583b3dc764bd1fdceada10417859.tar.gz gentoo-3194d18b9e7a583b3dc764bd1fdceada10417859.tar.bz2 gentoo-3194d18b9e7a583b3dc764bd1fdceada10417859.zip | |
net-misc/openssh: depend on newer gcc-config or clang-toolchain-symlinks
Made the classic mistake I always moan about! Blockers don't affect
dependency resolution, although they do mean "eventual consistency"
in that it ensures you do upgrade by the end of the run.
Let's be safe given we're talking miscompilation here (i.e. runtime
failure) and depend on newer gcc-config (or newer clang-toolchain-symlinks)
in openssh to make sure the merge order is correct.
Bug: https://bugs.gentoo.org/872416
Bug: https://bugs.gentoo.org/872548
See: cc6a27ec99c1e08ac51c69ff0ab4c2b8a5578e2e
Fixes: 961f11b11a0022c5a4a4a34cc4065d13a48906ba
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/openssh-9.0_p1-r6.ebuild (renamed from net-misc/openssh/openssh-9.0_p1-r5.ebuild) | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/net-misc/openssh/openssh-9.0_p1-r5.ebuild b/net-misc/openssh/openssh-9.0_p1-r6.ebuild index 072e3ca8f2df..84ce8c292cc7 100644 --- a/net-misc/openssh/openssh-9.0_p1-r5.ebuild +++ b/net-misc/openssh/openssh-9.0_p1-r6.ebuild @@ -57,7 +57,9 @@ REQUIRED_USE=" # tests currently fail with XMSS REQUIRED_USE+="test? ( !xmss )" +# Blocker on older gcc-config for bug #872416 LIB_DEPEND=" + !<sys-devel/gcc-config-2.6 audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] @@ -88,11 +90,18 @@ RDEPEND="${RDEPEND} !prefix? ( sys-apps/shadow ) X? ( x11-apps/xauth ) " -# Blocker on older gcc-config for bug #872416 +# Weird dep construct for newer gcc-config for bug #872416 BDEPEND=" - !<sys-devel/gcc-config-2.6 sys-devel/autoconf virtual/pkgconfig + || ( + >=sys-devel/gcc-config-2.6 + || ( + >=sys-devel/clang-toolchain-symlinks-14-r1:14 + >=sys-devel/clang-toolchain-symlinks-15-r1:15 + >=sys-devel/clang-toolchain-symlinks-16-r1:* + ) + ) verify-sig? ( sec-keys/openpgp-keys-openssh ) " |