Browse Source

fix linking problem for sure now

Waldemar Brodkorb 9 years ago
parent
commit
08766c90da
2 changed files with 6 additions and 5 deletions
  1. 1 1
      package/u-boot/Makefile
  2. 5 4
      package/u-boot/patches/patch-tools_Makefile

+ 1 - 1
package/u-boot/Makefile

@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		u-boot
 PKG_NAME:=		u-boot
 PKG_VERSION:=		2015.07
 PKG_VERSION:=		2015.07
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_HASH:=		0b48c9bd717f2c322ef791f8282e14c88be942dc7d1226df7e31a812a3af94d9
 PKG_HASH:=		0b48c9bd717f2c322ef791f8282e14c88be942dc7d1226df7e31a812a3af94d9
 PKG_DESCR:=		portable bootloader
 PKG_DESCR:=		portable bootloader
 PKG_SECTION:=		base/boot
 PKG_SECTION:=		base/boot

+ 5 - 4
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.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
++++ u-boot-2015.07/tools/Makefile	2015-07-30 09:57:50.209525093 +0200
-@@ -123,7 +123,7 @@ endif
+@@ -122,8 +122,7 @@ endif
+ 
  # MXSImage needs LibSSL
  # MXSImage needs LibSSL
  ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),)
  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")
-+	$(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto -dl")
++HOSTLOADLIBES_mkimage += -lssl -lcrypto -ldl
  endif
  endif
  
  
  HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage)
  HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage)