domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/mkimage: pass --static via PKG_CONFIG_EXTRAARGS

Browse Source 
Remove the then unnecessary patch doing exactly that individually.

See also 09465d80 "u-boot.mk: always link host libraries static".

Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider
2021-11-01 07:59:21 +01:00
committed by Hauke Mehrtens
parent 15e55a2190
commit e37dffbf35
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/mkimage/Makefile
View File

@@ -32,6 +32,7 @@ define Host/Compile
$(MAKE) -C $(HOST_BUILD_DIR) \ $(MAKE) -C $(HOST_BUILD_DIR) \
HOSTCFLAGS="$(HOST_CFLAGS)" \ HOSTCFLAGS="$(HOST_CFLAGS)" \
HOSTLDFLAGS="$(HOST_LDFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS)" \
PKG_CONFIG_EXTRAARGS="--static" \
no-dot-config-targets=tools-only \ no-dot-config-targets=tools-only \
CONFIG_MKIMAGE_DTC_PATH=dtc \ CONFIG_MKIMAGE_DTC_PATH=dtc \
CONFIG_FIT=y \ CONFIG_FIT=y \

14
tools/mkimage/patches/210-link-libcrypto-static.patch
View File

@@ -1,14 +0,0 @@
OpenWrt links the libressl statically against mkimage, make sure all the
needed dependencies are added too.
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -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 -lcrypto")
# OS X deprecate openssl in favour of CommonCrypto, supress deprecation
# warnings on those systems