summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Smith <matthew@gentoo.org>2022-09-29 09:42:47 +0100
committerMatthew Smith <matthew@gentoo.org>2022-09-29 09:42:47 +0100
commit5fafbac4f479bf7c882d4e58962d5e5b313e8bbe (patch)
tree0846d382ee69f91ec15586bb95461438f4750c25 /net-misc
parentnet-misc/putty: Stabilize 0.77-r2 ppc, #869317 (diff)
downloadgentoo-5fafbac4f479bf7c882d4e58962d5e5b313e8bbe.tar.gz
gentoo-5fafbac4f479bf7c882d4e58962d5e5b313e8bbe.tar.bz2
gentoo-5fafbac4f479bf7c882d4e58962d5e5b313e8bbe.zip
net-misc/putty: fix USE=-gssapi build
Closes: https://bugs.gentoo.org/873355 Signed-off-by: Matthew Smith <matthew@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/putty/files/putty-0.77-nogssapi.patch18
-rw-r--r--net-misc/putty/putty-0.77-r3.ebuild (renamed from net-misc/putty/putty-0.77-r2.ebuild)5
2 files changed, 23 insertions, 0 deletions
diff --git a/net-misc/putty/files/putty-0.77-nogssapi.patch b/net-misc/putty/files/putty-0.77-nogssapi.patch
new file mode 100644
index 000000000000..84d36e1849e0
--- /dev/null
+++ b/net-misc/putty/files/putty-0.77-nogssapi.patch
@@ -0,0 +1,18 @@
+Define NO_GSSAPI when -DPUTTY_GSSAPI=OFF
+
+Previously it would only be defined if -DPUTTY_GSSAPI=DYNAMIC and libdl is
+not found on the system. Setting -DPUTTY_GSSAPI=OFF on systems with glibc
+2.33 and earlier causes a build failure, because libdl is not linked in.
+
+Bug: https://bugs.gentoo.org/873355
+--- a/cmake/platforms/unix.cmake
++++ b/cmake/platforms/unix.cmake
+@@ -105,6 +105,8 @@
+ "Could not find libdl -- cannot provide dynamic GSSAPI support")
+ set(NO_GSSAPI ON)
+ endif()
++else()
++ set(NO_GSSAPI ON)
+ endif()
+
+ if(PUTTY_GSSAPI STREQUAL STATIC)
diff --git a/net-misc/putty/putty-0.77-r2.ebuild b/net-misc/putty/putty-0.77-r3.ebuild
index f3873e1fcf7f..737dcfe68966 100644
--- a/net-misc/putty/putty-0.77-r2.ebuild
+++ b/net-misc/putty/putty-0.77-r3.ebuild
@@ -44,6 +44,11 @@ REQUIRED_USE="
gtk2? ( gtk )
"
+PATCHES=(
+ # Bug #873355
+ "${FILESDIR}"/putty-0.77-nogssapi.patch
+)
+
src_unpack() {
[[ ${PV} == *9999 ]] && git-r3_src_unpack
default