diff options
Diffstat (limited to 'package/dropbear')
| -rw-r--r-- | package/dropbear/dropbear-0.53.1-static_build_fix.patch | 26 | ||||
| -rw-r--r-- | package/dropbear/dropbear.mk | 9 |
2 files changed, 30 insertions, 5 deletions
diff --git a/package/dropbear/dropbear-0.53.1-static_build_fix.patch b/package/dropbear/dropbear-0.53.1-static_build_fix.patch new file mode 100644 index 000000000..0e0a91a27 --- /dev/null +++ b/package/dropbear/dropbear-0.53.1-static_build_fix.patch @@ -0,0 +1,26 @@ +dropbear: fix static build + +the -lcrypt is missing during the link + +svr-authpasswd.o: In function `svr_auth_password': +svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt' +collect2: ld returned 1 exit status + +Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: b/Makefile.in +=================================================================== +--- a/Makefile.in ++++ b/Makefile.in +@@ -77,7 +77,7 @@ STRIP=@STRIP@ + INSTALL=@INSTALL@ + CPPFLAGS=@CPPFLAGS@ + CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ +-LIBS+=@LIBS@ ++LIBS+=@CRYPTLIB@ @LIBS@ + LDFLAGS=@LDFLAGS@ + + EXEEXT=@EXEEXT@ diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index fab7c9678..d73e99346 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -9,14 +9,13 @@ DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases DROPBEAR_DEPENDENCIES = zlib DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh -# configure misdetects this as no, but the result is not used for -# anything. Unfortunately it breaks the build for other packages also -# checking for struct sockaddr_storage when using a shared config -# cache, so force it to yes -DROPBEAR_CONF_ENV = ac_cv_type_struct_sockaddr_storage=yes DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \ PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" +ifeq ($(BR2_PREFER_STATIC_LIB),y) +DROPBEAR_MAKE += STATIC=1 +endif + define DROPBEAR_FIX_XAUTH $(SED) 's,^#define XAUTH_COMMAND.*/xauth,#define XAUTH_COMMAND "/usr/bin/xauth,g' $(@D)/options.h endef |