Current-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Build failure for evbarmv6hf due to new OpenSSH
Hi,
Build for evbarmv6hf{,eb} fails due to collision of symbol tilde_expand b/w
libedit and new libopenssh:
----
# link obj.evbarm-earmv6hfeb/ramdiskbin
/build/tools/lib/gcc/armv6eb--netbsdelf-eabihf/10.3.0/../../../../armv6eb--netbsdelf-eabihf/bin/ld: /build/dest/evbarm-earmv6hfeb/usr/lib/libssh.a(misc.o): in function `tilde_expand':
misc.c:(.text+0x2364): multiple definition of `tilde_expand'; /build/dest/evbarm-earmv6hfeb/usr/lib/libedit.a(readline.o):readline.c:(.text+0x3544): first defined here
collect2: error: ld returned 1 exit status
----
tilde_expand() in libedit should be global for compatibility with readline.
Mangle OpenSSH one, which cannot be static unfortunately?
----
--- crypto/external/bsd/openssh/dist/misc.h 2 Sep 2021 11:26:18 -0000 1.22
+++ crypto/external/bsd/openssh/dist/misc.h 3 Sep 2021 09:41:16 -0000
@@ -45,6 +45,11 @@ struct ForwardOptions {
/* misc.c */
+#ifdef __NetBSD__
+/* XXX avoid collision with libedit/readline */
+#define tilde_expand openssh_tilde_expand
+#endif
+
char *chop(char *);
void rtrim(char *);
void skip_space(char **);
----
Thanks,
rin
Home |
Main Index |
Thread Index |
Old Index