[Buildroot] [PATCH 1/3] package/uftp: needs MMU, threads and wchar

[Buildroot] [PATCH 1/3] package/uftp: needs MMU, threads and wchar

[Fabrice Fontaine]

Fixes:
 - http://autobuild.buildroot.org/results/47dd067dfdcaae99d50216f59ea6af115d8f1e1e

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/uftp/Config.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/uftp/Config.in b/package/uftp/Config.in
index b6a8961628..ca6e5f9a05 100644
--- a/package/uftp/Config.in
+++ b/package/uftp/Config.in
@@ -1,7 +1,14 @@
 config BR2_PACKAGE_UFTP
 	bool "uftp"
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_OPENSSL
 	help
 	  Encrypted UDP based FTP with multicast.
 
 	  http://uftp-multicast.sourceforge.net/
+
+comment "uftp needs a toolchain w/ threads, wchar"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
-- 
2.14.1

[Buildroot] [PATCH 2/3] package/uftp: fix openssl static linking

[Fabrice Fontaine]

Fixes:
 - http://autobuild.buildroot.org/results/051cfd993b65830c34e675d797e241c272b6f35a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/uftp/uftp.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/uftp/uftp.mk b/package/uftp/uftp.mk
index bbc362652b..1f75a5bac8 100644
--- a/package/uftp/uftp.mk
+++ b/package/uftp/uftp.mk
@@ -10,12 +10,17 @@ UFTP_DEPENDENCIES = openssl
 UFTP_LICENSE = GPL-3.0+
 UFTP_LICENSE_FILES = LICENSE.txt
 
+ifeq ($(BR2_STATIC_LIBS),y)
+UFTP_MAKE_OPTS += CRYPT_LIB='-lssl -lcrypto -lz'
+endif
+
 define UFTP_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(UFTP_MAKE_OPTS)
 endef
 
 define UFTP_INSTALL_TARGET_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(UFTP_MAKE_OPTS) \
+		DESTDIR=$(TARGET_DIR) install
 endef
 
 $(eval $(generic-package))
-- 
2.14.1

[Buildroot] [PATCH 2/3] package/uftp: fix openssl static linking

[Thomas Petazzoni]

On Tue, 19 Mar 2019 21:46:41 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> +ifeq ($(BR2_STATIC_LIBS),y)
> +UFTP_MAKE_OPTS += CRYPT_LIB='-lssl -lcrypto -lz'

What about using pkg-config here ?

CRYPT_LIB=$(shell pkg-config --libs ssl)

this avoids hardcoding a bunch of assumptions about what OpenSSL
depends on, and you can also drop the BR2_STATIC_LIBS condition.

What do you think ?

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 3/3] package/uftp: openssl is optional, not mandatory

[Fabrice Fontaine]

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/uftp/Config.in | 1 -
 package/uftp/uftp.mk   | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/uftp/Config.in b/package/uftp/Config.in
index ca6e5f9a05..b88fb03ae2 100644
--- a/package/uftp/Config.in
+++ b/package/uftp/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_UFTP
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR
-	select BR2_PACKAGE_OPENSSL
 	help
 	  Encrypted UDP based FTP with multicast.
 
diff --git a/package/uftp/uftp.mk b/package/uftp/uftp.mk
index 1f75a5bac8..b8d4359da3 100644
--- a/package/uftp/uftp.mk
+++ b/package/uftp/uftp.mk
@@ -6,13 +6,17 @@
 
 UFTP_VERSION = 4.9.9
 UFTP_SITE = http://sourceforge.net/projects/uftp-multicast/files/source-tar
-UFTP_DEPENDENCIES = openssl
 UFTP_LICENSE = GPL-3.0+
 UFTP_LICENSE_FILES = LICENSE.txt
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+UFTP_DEPENDENCIES += openssl
 ifeq ($(BR2_STATIC_LIBS),y)
 UFTP_MAKE_OPTS += CRYPT_LIB='-lssl -lcrypto -lz'
 endif
+else
+UFTP_MAKE_OPTS += NO_ENCRYPTION=1
+endif
 
 define UFTP_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(UFTP_MAKE_OPTS)
-- 
2.14.1

[Buildroot] [PATCH 1/3] package/uftp: needs MMU, threads and wchar

[Thomas Petazzoni]

On Tue, 19 Mar 2019 21:46:40 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Fixes:
>  - http://autobuild.buildroot.org/results/47dd067dfdcaae99d50216f59ea6af115d8f1e1e
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/uftp/Config.in | 7 +++++++
>  1 file changed, 7 insertions(+)

Applied to master, thanks. Following my comment on PATCH 2/3, I have
marked PATCH 2/3 and 3/3 as Changes Requested in Patchwork.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com