diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-09-01 09:59:08 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-09-01 09:59:08 +0200 |
| commit | cfc70a48027b1b56231df62a30a7da888f33e3ce (patch) | |
| tree | cb2e856d51f1a79822a2b21d8c2cbaea55ae170d /package/uboot-tools/0004-tools-use-pkg-config-when-available-to-get-SSL-flags.patch | |
| parent | 70874e321dbd50203187c41214cb888507cd6df1 (diff) | |
| parent | aa016797444017d4379a139e39697e38ed2e2357 (diff) | |
| download | buildroot-cfc70a48027b1b56231df62a30a7da888f33e3ce.tar.gz buildroot-cfc70a48027b1b56231df62a30a7da888f33e3ce.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/uboot-tools/0004-tools-use-pkg-config-when-available-to-get-SSL-flags.patch')
| -rw-r--r-- | package/uboot-tools/0004-tools-use-pkg-config-when-available-to-get-SSL-flags.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/package/uboot-tools/0004-tools-use-pkg-config-when-available-to-get-SSL-flags.patch b/package/uboot-tools/0004-tools-use-pkg-config-when-available-to-get-SSL-flags.patch deleted file mode 100644 index 9eb74834da..0000000000 --- a/package/uboot-tools/0004-tools-use-pkg-config-when-available-to-get-SSL-flags.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 99bc38ac6ebdd3b5d741cb9e50d842fa13d409f7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Date: Tue, 12 May 2015 22:54:29 +0200 -Subject: [PATCH] tools: use pkg-config when available to get SSL flags - -Instead of hardcoding -lssl -lcrypto as the flags needed to build -mkimage with FIT signature enabled, use pkg-config when -available. This allows to properly support cases where static linking -is used, which requires linking with -lz, since OpenSSL uses zlib -internally. - -We gracefully fallback on the previous behavior of hardcoding -lssl --lcrypto if pkg-config is not available or fails with an error. - -Patch submitted upstream at -http://lists.denx.de/pipermail/u-boot/2015-May/214489.html - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> ---- - tools/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/Makefile b/tools/Makefile -index 4bbb153..8ff9c2e 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -122,7 +122,8 @@ endif - - # MXSImage needs LibSSL - ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),) --HOSTLOADLIBES_mkimage += -lssl -lcrypto -+HOSTLOADLIBES_mkimage += \ -+ $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto") - endif - - HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage) --- -2.1.0 - |
