Pārlūkot izejas kodu

vsftp: enable and fix linking

Patch by Wade Berrier.

It still errors out on sysdeputil.c for me, but this is no worse than
it was before, so committing.
Peter Korsgaard 17 gadi atpakaļ
vecāks
revīzija
8bba7f0d67
2 mainītis faili ar 6 papildinājumiem un 1 dzēšanām
  1. 1 0
      package/Config.in
  2. 5 1
      package/vsftpd/vsftpd.mk

+ 1 - 0
package/Config.in

@@ -227,6 +227,7 @@ source "package/ttcp/Config.in"
 #endif
 source "package/udpcast/Config.in"
 source "package/vpnc/Config.in"
+source "package/vsftpd/Config.in"
 source "package/vtun/Config.in"
 source "package/webif/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS

+ 5 - 1
package/vsftpd/vsftpd.mk

@@ -9,9 +9,13 @@ VSFTPD_SITE:=ftp://vsftpd.beasts.org/users/cevans
 VSFTPD_DIR:=$(BUILD_DIR)/vsftpd-$(VSFTPD_VERSION)
 VSFTPD_CAT:=$(ZCAT)
 VSFTPD_BINARY:=vsftpd
+VSFTPD_TARGET_BINARY:=usr/sbin/vsftpd
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 VSFTPF_PREREQ:=openssl
+VSFTPD_LIBS:=-lcrypt -lssl
+else
+VSFTPD_LIBS:=-lcrypt
 endif
 ifeq ($(BR2_LARGEFILE),)
 #BR2_VSFTPD_CFLAGS:=-U_LARGEFILE64_SOURCE -U_FILE_OFFSET_BITS
@@ -45,7 +49,7 @@ endif
 
 
 $(VSFTPD_DIR)/$(VSFTPD_BINARY): $(VSFTPF_PREREQ) $(VSFTPD_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS) $(BR2_VSFTPD_CFLAGS)" -C $(VSFTPD_DIR)
+	$(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS) $(BR2_VSFTPD_CFLAGS)" LIBS="$(VSFTPD_LIBS)" -C $(VSFTPD_DIR)
 
 $(TARGET_DIR)/usr/sbin/$(VSFTPD_BINARY): $(VSFTPD_DIR)/$(VSFTPD_BINARY)
 	cp -dpf $< $@