Przeglądaj źródła

dropbear: override detection of struct sockaddr_storage

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 (like rsync) when using a shared config cache,
so force it to yes.

Reported-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 15 lat temu
rodzic
commit
c59d700786
2 zmienionych plików z 9 dodań i 4 usunięć
  1. 4 4
      CHANGES
  2. 5 0
      package/dropbear/dropbear.mk

+ 4 - 4
CHANGES

@@ -14,10 +14,10 @@
 	luasocket, rings, wsapi, xavante, xterm
 
 	Updated/fixed packages: berkeleydb, busybox, cdrkit, dash,
-	dialog, diffutils, distcc, dmalloc, dnsmasq, fbv, file, gawk,
-	gstreamer, gzip, intltool, ipsec-tools, iptables, libart,
-	libfuse, libgpg-error, libidn, liblockfile, links, lmbench,
-	lrzsz, make, module-init-tools, nbd, ncurses, netperf,
+	dialog, diffutils, distcc, dmalloc, dnsmasq, dropbear, fbv,
+	file, gawk, gstreamer, gzip, intltool, ipsec-tools, iptables,
+	libart, libfuse, libgpg-error, libidn, liblockfile, links,
+	lmbench, lrzsz, make, module-init-tools, nbd, ncurses, netperf,
 	ntfsprogs, openssl, php, qt, quagga, sqlite, sdl, sdl_mixer,
 	sdl_ttf, squashfs, tn5250, usbutils, xkeyboard-config
 

+ 5 - 0
package/dropbear/dropbear.mk

@@ -9,6 +9,11 @@ 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"