summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2022-09-20 05:23:08 +0200
committerLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2022-09-20 05:23:08 +0200
commit69b5be681e337f4f89c15fac317c1e63295a3ac5 (patch)
tree3aa37152d34bd412131430b72028e486301f3808
parent02265155c19ec04d5cdbb8f9509970a74b27c890 (diff)
downloadmidipix_build-69b5be681e337f4f89c15fac317c1e63295a3ac5.tar.bz2
midipix_build-69b5be681e337f4f89c15fac317c1e63295a3ac5.tar.xz
groups/241.native_packages_inet.group:openssh:${PKG_ENV_VARS_EXTRA}: adds -ltinfo.
patches/openssh-9.0p1.local.patch: fix braindead configure script wrt. libedit.
-rw-r--r--groups/241.native_packages_inet.group2
-rw-r--r--patches/openssh-9.0p1.local.patch11
2 files changed, 12 insertions, 1 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 231384ad..8eb8132f 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -205,7 +205,7 @@ mutt_cv_regex_broken=no"};
: ${PKG_OPENSSH_DEBUG_CONFIGURE_ARGS_EXTRA:=--disable-strip};
: ${PKG_OPENSSH_INSTALL_TARGET:=install-nokeys};
: ${PKG_OPENSSH_MAKEFLAGS_INSTALL_EXTRA:=STRIP_OPT=};
-: ${PKG_OPENSSH_ENV_VARS_EXTRA:="LIBEDIT=-ledit"};
+: ${PKG_OPENSSH_ENV_VARS_EXTRA:="LIBEDIT=-ledit -ltinfo"};
: ${PKG_PROXYTUNNEL_DEPENDS:="libressl"};
: ${PKG_PROXYTUNNEL_SHA256SUM:=6495430e9c60d3df53824a7a0f3bea9953a89d083a3718c72db04dc4d40755ac};
: ${PKG_PROXYTUNNEL_VERSION:=1.10.20200507}
diff --git a/patches/openssh-9.0p1.local.patch b/patches/openssh-9.0p1.local.patch
new file mode 100644
index 00000000..8e995354
--- /dev/null
+++ b/patches/openssh-9.0p1.local.patch
@@ -0,0 +1,11 @@
+--- openssh-9.0p1/configure.orig 2022-04-07 06:51:43.000000000 +0200
++++ openssh-9.0p1/configure 2022-09-20 05:19:31.505197136 +0200
+@@ -11394,8 +11394,6 @@
+ if test "x$use_pkgconfig_for_libedit" = "xyes"; then
+ LIBEDIT=`$PKGCONFIG --libs libedit`
+ CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
+- else
+- LIBEDIT="-ledit -lcurses"
+ fi
+ OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for el_init in -ledit" >&5