aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-04-29 00:39:38 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2018-04-29 00:57:35 +0200
commit5ca159ab3b36c97197bff6a50f65e1666a8f78ec (patch)
treebfa81704930ede5ed240dab845864b12d878a868
parent60427a940f084efea7fbfc3f072dc4cff80b7e33 (diff)
downloadupstream-5ca159ab3b36c97197bff6a50f65e1666a8f78ec.tar.gz
upstream-5ca159ab3b36c97197bff6a50f65e1666a8f78ec.tar.bz2
upstream-5ca159ab3b36c97197bff6a50f65e1666a8f78ec.zip
uboot-zynq: Fix build with libressl 2.7.2
When libressl was linked the libpthread was missing, add it in addition. Fixes: 2c192b69163f ("tools/libressl: update to version 2.7.2") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--package/boot/uboot-zynq/patches/210-link-libcrypto-static.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/package/boot/uboot-zynq/patches/210-link-libcrypto-static.patch b/package/boot/uboot-zynq/patches/210-link-libcrypto-static.patch
new file mode 100644
index 0000000000..a260e84e80
--- /dev/null
+++ b/package/boot/uboot-zynq/patches/210-link-libcrypto-static.patch
@@ -0,0 +1,14 @@
+OpenWrt links the libressl statically against mkimage, make sure all the
+needed dependencies are added too.
+
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -128,7 +128,7 @@ endif
+ # MXSImage needs LibSSL
+ ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),)
+ HOSTLOADLIBES_mkimage += \
+- $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto")
++ $(shell pkg-config --libs --static libssl libcrypto 2> /dev/null || echo "-lssl -lpthread -lcrypto")
+
+ # OS X deprecate openssl in favour of CommonCrypto, supress deprecation
+ # warnings on those systems