package/uftp: needs MMU, threads and wchar
PATCH 1/3 package/uftp: needs MMU, threads and wchar
Fixes:
- http://autobuild.buildroot.org/results/47dd067dfdcaae99d50216f59ea6af115d8f1e1e
--- package/uftp/Config.in | 7 +++++++ 1 file changed, 7 insertions(+)
package/uftp/Config.in +7 -0
@@ -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
Signature · 1 line
2.14.1
PATCH 2/3 package/uftp: fix openssl static linking
Fixes:
- http://autobuild.buildroot.org/results/051cfd993b65830c34e675d797e241c272b6f35a
--- package/uftp/uftp.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
package/uftp/uftp.mk +7 -2
@@ -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))
Signature · 1 line
2.14.1
PATCH 2/3 package/uftp: fix openssl static linking
package/uftp/uftp.mk UFTP_DEPENDENCIES = openssl · line 14
Quoted 2 lines · On Tue, 19 Mar 2019 21:46:41 +0100 Fabrice Fontaine…
package/uftp/uftp.mk +2
-0+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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 3/3 package/uftp: openssl is optional, not mandatory
In reply to Fabrice Fontaine--- package/uftp/Config.in | 1 - package/uftp/uftp.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-)
package/uftp/Config.in +0 -1
@@ -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.
package/uftp/uftp.mk +5 -1
@@ -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)
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH 1/3 package/uftp: needs MMU, threads and wchar
In reply to Fabrice FontaineQuoted 7 lines · On Tue, 19 Mar 2019 21:46:40 +0100 Fabrice Fontaine…
Fixes:
- http://autobuild.buildroot.org/results/47dd067dfdcaae99d50216f59ea6af115d8f1e1eSigned-off-by Fabrice Fontaine <[email protected]>--- 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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com