Skip to contentSkip to conversation

package/rtty: fix build with mbedtls but without zlib

PATCH Superseded Fabrice Fontaine 2 participants 6 messages Aug 30, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/rtty: fix build with mbedtls but without zlib

Fixes:
- http://autobuild.buildroot.org/results/a0ebffe58bbf14cab74b7d2111d4d88a9c725273

---
 ...xt-fix-build-with-mbedtls-but-withou.patch | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/rtty/0001-src-CMakeLists.txt-fix-build-with-mbedtls-but-withou.patch
package/rtty/0001-src-CMakeLists.txt-fix-build-with-mbedtls-but-withou.patch new file +47 -0
new file mode 100644
index 0000000000..b7275462af
@@ -0,0 +1,47 @@
+From 0982308255dd3fd70e7b93aa88a8f3c5b9c1b845 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sun, 30 Aug 2020 21:15:06 +0200
+Subject: [PATCH] src/CMakeLists.txt: fix build with mbedtls but without zlib
+
+Building with mbedtls but without zlib will result in the following
+build failure:
+
+-- Found MbedTLS: /home/peko/autobuild/instance-0/output-1/per-package/rtty/host/powerpc64-buildroot-linux-gnu/sysroot/usr/lib/libmbedtls.so (found version "2.16.7")
+-- Could NOT find ZLIB (missing: ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+-- Select MbedTLS(PolarSSL) as the SSL backend
+CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
+Please set them or make sure they are set and tested correctly in the CMake files:
+ZLIB_LIBRARY
+    linked by target "rtty" in directory /home/peko/autobuild/instance-0/output-1/build/rtty-7.1.4/src
+
+-- Configuring incomplete, errors occurred!
+
+Fixes:
+ - http://autobuild.buildroot.org/results/a0ebffe58bbf14cab74b7d2111d4d88a9c725273
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status: https://github.com/zhaojh329/rtty/pull/77]
+---
+ src/CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 10f6626..d09e848 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -77,7 +77,11 @@ else()
+     elseif(RTTY_USE_MBEDTLS)
+         set(SSL_NAME "MbedTLS(PolarSSL)")
+         set(SSL_INC ${MBEDTLS_INCLUDE_DIR})
+-        set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES})
++        if(ZLIB_FOUND)
++            set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES})
++        else()
++            set(SSL_LIB ${MBEDTLS_LIBRARIES}) 
++        endif()
+         set(RTTY_HAVE_MBEDTLS_CONFIG 1)
+     endif()
+ 
+-- 
+2.28.0
+
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 package/rtty: fix build with mbedtls but without zlib

Quoted 3 lines · On Sun, 30 Aug 2020 21:20:29 +0200 Fabrice Fontaine…
+-        set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES})
++        if(ZLIB_FOUND)
++            set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES})

Is there a reason why zlib is necessary for mbedtls support ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/rtty: fix build with mbedtls but without zlib

Le dim. 30 ao?t 2020 ? 22:02, Thomas Petazzoni
<[email protected]> a ?crit :

Quoted 9 lines
Quoted 3 lines · On Sun, 30 Aug 2020 21:20:29 +0200 Fabrice Fontaine…
+-        set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES})
++        if(ZLIB_FOUND)
++            set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES})

Is there a reason why zlib is necessary for mbedtls support ?

zlib is not mandatory with mbedtls, only optional, however as mbedtls does not provide a pkg-config file, we assume that if zlib is available, we must link with it to avoid a build failure when linking statically with a zlib-enabled mbedtls.
This change was pushed upstream with
https://github.com/zhaojh329/rtty/commit/7b8efe11dbafce97971dc130bf6cc1756f34ce07.
However, we missed that this change will raise a build failure if ZLIB_LIBRARIES is used when zlib is not found.

Quoted 6 lines

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

Best Regards,

Fabrice

#3 lore raw

PATCH 1/1 package/rtty: fix build with mbedtls but without zlib

Quoted 9 lines · On Sun, 30 Aug 2020 22:11:43 +0200 Fabrice Fontaine…
Quoted 1 line

Is there a reason why zlib is necessary for mbedtls support ?

zlib is not mandatory with mbedtls, only optional, however as mbedtls does not provide a pkg-config file, we assume that if zlib is available, we must link with it to avoid a build failure when linking statically with a zlib-enabled mbedtls.
This change was pushed upstream with
https://github.com/zhaojh329/rtty/commit/7b8efe11dbafce97971dc130bf6cc1756f34ce07.
However, we missed that this change will raise a build failure if ZLIB_LIBRARIES is used when zlib is not found.

It should be noted that the compression support in mbedtls is only enabled if BR2_PACKAGE_MBEDTLS_COMPRESSION=y.

So you can have a situation where mbedtls is enabled, zlib is enabled, but mbedtls is not using zlib. Your change will needlessly link rtty with zlib in such a situation.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/1 package/rtty: fix build with mbedtls but without zlib

Le dim. 30 ao?t 2020 ? 22:31, Thomas Petazzoni
<[email protected]> a ?crit :

Quoted 14 lines
Quoted 9 lines · On Sun, 30 Aug 2020 22:11:43 +0200 Fabrice Fontaine…
Quoted 1 line

Is there a reason why zlib is necessary for mbedtls support ?

zlib is not mandatory with mbedtls, only optional, however as mbedtls does not provide a pkg-config file, we assume that if zlib is available, we must link with it to avoid a build failure when linking statically with a zlib-enabled mbedtls.
This change was pushed upstream with
https://github.com/zhaojh329/rtty/commit/7b8efe11dbafce97971dc130bf6cc1756f34ce07.
However, we missed that this change will raise a build failure if ZLIB_LIBRARIES is used when zlib is not found.

Quoted 6 lines

It should be noted that the compression support in mbedtls is only enabled if BR2_PACKAGE_MBEDTLS_COMPRESSION=y.

So you can have a situation where mbedtls is enabled, zlib is enabled, but mbedtls is not using zlib. Your change will needlessly link rtty with zlib in such a situation.

The suggested patch is only fixing a build failure when zlib is not found. We're already linking needlessly with zlib since the bump to version 7.1.4 with commit 0c80245ddbe78c8e443f98b9bbccac56331cdb26.
So would you advise that I revert
https://github.com/zhaojh329/rtty/commit/7b8efe11dbafce97971dc130bf6cc1756f34ce07
and manually link with -lz in rtty.mk if BR2_PACKAGE_MBEDTLS_COMPRESSION is set?

Quoted 6 lines

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

Best Regards,

Fabrice

#5 lore raw

PATCH 1/1 package/rtty: fix build with mbedtls but without zlib

Quoted 7 lines · On Sun, 30 Aug 2020 22:39:43 +0200 Fabrice Fontaine…

The suggested patch is only fixing a build failure when zlib is not found. We're already linking needlessly with zlib since the bump to version 7.1.4 with commit 0c80245ddbe78c8e443f98b9bbccac56331cdb26.
So would you advise that I revert
https://github.com/zhaojh329/rtty/commit/7b8efe11dbafce97971dc130bf6cc1756f34ce07
and manually link with -lz in rtty.mk if BR2_PACKAGE_MBEDTLS_COMPRESSION is set?

The only sane way to fix this is to use pkg-config, but as you said mbedtls apparently doesn't provide any .pc file.

So I'd say, leave it as it is, but it's better to have the full explanation on the benefits/drawbacks in the commit log rather than having to second guess it.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com