summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbrodkorb@conet.de>2015-07-30 09:59:52 +0200
committerWaldemar Brodkorb <wbrodkorb@conet.de>2015-07-30 09:59:52 +0200
commit08766c90dace067bfc3c46e2769122ee7635cc63 (patch)
tree9d5ea6bf2fffaef6316abb825edb7433cb0f68c7
parent805522692e6d562cd7f536287f4686e29fdcf4a7 (diff)
fix linking problem for sure now
-rw-r--r--package/u-boot/Makefile2
-rw-r--r--package/u-boot/patches/patch-tools_Makefile9
2 files changed, 6 insertions, 5 deletions
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index 192785aa9..e9cb32090 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= u-boot
PKG_VERSION:= 2015.07
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_HASH:= 0b48c9bd717f2c322ef791f8282e14c88be942dc7d1226df7e31a812a3af94d9
PKG_DESCR:= portable bootloader
PKG_SECTION:= base/boot
diff --git a/package/u-boot/patches/patch-tools_Makefile b/package/u-boot/patches/patch-tools_Makefile
index 83da79edb..99df54622 100644
--- a/package/u-boot/patches/patch-tools_Makefile
+++ b/package/u-boot/patches/patch-tools_Makefile
@@ -1,11 +1,12 @@
--- u-boot-2015.07.orig/tools/Makefile 2015-07-14 19:32:21.000000000 +0200
-+++ u-boot-2015.07/tools/Makefile 2015-07-27 19:45:38.000000000 +0200
-@@ -123,7 +123,7 @@ endif
++++ u-boot-2015.07/tools/Makefile 2015-07-30 09:57:50.209525093 +0200
+@@ -122,8 +122,7 @@ endif
+
# MXSImage needs LibSSL
ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),)
- HOSTLOADLIBES_mkimage += \
+-HOSTLOADLIBES_mkimage += \
- $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto")
-+ $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto -dl")
++HOSTLOADLIBES_mkimage += -lssl -lcrypto -ldl
endif
HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage)