summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2024-07-26 10:28:09 +0200
committerFabian Groffen <grobian@gentoo.org>2024-07-26 10:28:09 +0200
commit3dff12d1212dece67236358b1f198108abac2642 (patch)
treed735901ee4cc81906842d2ff7210a3cf5bb2e448 /net-misc/telnet-bsd
parentdev-libs/cyrus-sasl-2.1.28-r4: fix compilation on certain platforms (diff)
downloadgentoo-3dff12d1212dece67236358b1f198108abac2642.tar.gz
gentoo-3dff12d1212dece67236358b1f198108abac2642.tar.bz2
gentoo-3dff12d1212dece67236358b1f198108abac2642.zip
net-misc/telnet-bsd-1.2-r4: fix compilation on Solaris and Darwin
openpty is defined in util.h or temios.h instead of pty.h on Linux Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'net-misc/telnet-bsd')
-rw-r--r--net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch31
-rw-r--r--net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild1
2 files changed, 32 insertions, 0 deletions
diff --git a/net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch b/net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch
new file mode 100644
index 000000000000..332e7951ea53
--- /dev/null
+++ b/net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch
@@ -0,0 +1,31 @@
+build: openpty is declared in different headers on some systems
+
+Check for util.h next to pty.h for openpty is declared in it on at least
+Darwin systems. Solaris needs termios.h
+
+--- telnet-bsd-1.2/configure.in 2024-07-26 10:13:46.814937718 +0200
++++ telnet-bsd-1.2/configure.in 2024-07-26 10:19:15.734016104 +0200
+@@ -12,7 +12,7 @@
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION)
+
+-AC_CHECK_HEADERS([pty.h utmp.h])
++AC_CHECK_HEADERS([pty.h util.h termios.h utmp.h])
+
+ if test x"$ac_default_prefix" = x"/usr"
+ then
+--- telnet-bsd-1.2/telnetd/sys_term.c 2024-07-26 10:13:46.859137256 +0200
++++ telnet-bsd-1.2/telnetd/sys_term.c 2024-07-26 10:19:54.700983107 +0200
+@@ -36,6 +36,12 @@
+ #ifdef HAVE_PTY_H
+ #include <pty.h>
+ #endif
++#ifdef HAVE_UTIL_H
++#include <util.h>
++#endif
++#ifdef HAVE_TERMIOS_H
++#include <termios.h>
++#endif
+
+ #include "telnetd.h"
+ #include "pathnames.h"
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild
index 8ba189abbfd1..582837e7ab7c 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
"${FILESDIR}"/${P}-fbsd.patch
"${FILESDIR}"/${PN}-1.2-format-security.patch
"${FILESDIR}"/${P}-musl.patch
+ "${FILESDIR}"/${P}-openpty-util.patch
)
src_prepare() {