diff options
| author | Andre Heider <a.heider@gmail.com> | 2020-08-19 17:54:58 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-09-18 21:42:05 +0200 |
| commit | ae2e521b34ca3504e7f32898dcd7e1c71707d206 (patch) | |
| tree | 1686698ffcd2bf13b70d61aa7fcb0aff1573adb0 /package/boot/uboot-mvebu/patches/210-link-libcrypto-static.patch | |
| parent | 5582fbd6135f7db4ba8bd887c360007f3b18dba1 (diff) | |
| download | upstream-ae2e521b34ca3504e7f32898dcd7e1c71707d206.tar.gz upstream-ae2e521b34ca3504e7f32898dcd7e1c71707d206.tar.bz2 upstream-ae2e521b34ca3504e7f32898dcd7e1c71707d206.zip | |
uboot-mvebu: update to v2020.10-rc4
TODO: switch to release v2020.10 once released.
Remove one merged patch, refresh the rest.
Signed-off-by: Andre Heider <a.heider@gmail.com>
Diffstat (limited to 'package/boot/uboot-mvebu/patches/210-link-libcrypto-static.patch')
| -rw-r--r-- | package/boot/uboot-mvebu/patches/210-link-libcrypto-static.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/boot/uboot-mvebu/patches/210-link-libcrypto-static.patch b/package/boot/uboot-mvebu/patches/210-link-libcrypto-static.patch index ee6c73f469..eb0b05e4c6 100644 --- a/package/boot/uboot-mvebu/patches/210-link-libcrypto-static.patch +++ b/package/boot/uboot-mvebu/patches/210-link-libcrypto-static.patch @@ -3,10 +3,10 @@ needed dependencies are added too. --- a/tools/Makefile +++ b/tools/Makefile -@@ -145,7 +145,7 @@ endif - # MXSImage needs LibSSL - ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_ARMADA_39X)$(CONFIG_FIT_SIGNATURE),) - HOSTLOADLIBES_mkimage += \ +@@ -158,7 +158,7 @@ ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CON + HOSTCFLAGS_kwbimage.o += \ + $(shell pkg-config --cflags libssl libcrypto 2> /dev/null || echo "") + HOSTLDLIBS_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") |