From 740ed0ede4a75894dfef5cca6047ccd7e0d12ac3 Mon Sep 17 00:00:00 2001 From: Luka Perkov <luka@openwrt.org> Date: Mon, 19 May 2014 16:41:24 +0000 Subject: [PATCH] uboot-envtools: update to 2014.04 Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 40778 --- package/boot/uboot-envtools/Makefile | 14 +++++++------- .../boot/uboot-envtools/patches/001-compile.patch | 13 +++++++++++++ .../patches/001-honor_opt_flags.patch | 12 ------------ 3 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 package/boot/uboot-envtools/patches/001-compile.patch delete mode 100644 package/boot/uboot-envtools/patches/001-honor_opt_flags.patch diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile index 631032c247..0f7c82560f 100644 --- a/package/boot/uboot-envtools/Makefile +++ b/package/boot/uboot-envtools/Makefile @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uboot-envtools PKG_DISTNAME:=u-boot -PKG_VERSION:=2013.10 -PKG_RELEASE:=3 +PKG_VERSION:=2014.04 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://mirror2.openwrt.org/sources \ ftp://ftp.denx.de/pub/u-boot -PKG_MD5SUM:=a076a044b64371edc52f7e562b13f6b2 +PKG_MD5SUM:=6d2116d1385a66e9a59742caa9d62a54 PKG_BUILD_DIR:=$(BUILD_DIR)/u-boot-$(PKG_VERSION) @@ -35,14 +35,14 @@ define Package/uboot-envtools/description endef define Build/Configure + touch $(PKG_BUILD_DIR)/include/config.mk + touch $(PKG_BUILD_DIR)/include/config.h endef define Build/Compile - touch $(PKG_BUILD_DIR)/include/config.h $(MAKE) -C $(PKG_BUILD_DIR) \ - HOSTCC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)gcc" \ - HOSTOPTFLAGS="$(TARGET_CFLAGS)" \ - HOSTSTRIP="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)strip" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + TARGET_CFLAGS="$(TARGET_CFLAGS)" \ env endef diff --git a/package/boot/uboot-envtools/patches/001-compile.patch b/package/boot/uboot-envtools/patches/001-compile.patch new file mode 100644 index 0000000000..5e038ce729 --- /dev/null +++ b/package/boot/uboot-envtools/patches/001-compile.patch @@ -0,0 +1,13 @@ +--- a/tools/env/Makefile ++++ b/tools/env/Makefile +@@ -10,6 +10,10 @@ + # with "CC" here for the maximum code reuse of scripts/Makefile.host. + HOSTCC = $(CC) + ++ifneq ($(TARGET_CFLAGS),) ++HOSTCFLAGS = $(TARGET_CFLAGS) ++endif ++ + # Compile for a hosted environment on the target + HOST_EXTRACFLAGS = $(patsubst -I%,-idirafter%, $(UBOOTINCLUDE)) \ + -idirafter $(srctree)/tools/env \ diff --git a/package/boot/uboot-envtools/patches/001-honor_opt_flags.patch b/package/boot/uboot-envtools/patches/001-honor_opt_flags.patch deleted file mode 100644 index 16c3920bd6..0000000000 --- a/package/boot/uboot-envtools/patches/001-honor_opt_flags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -62,7 +62,8 @@ PLATFORM_LDFLAGS = - - ######################################################################### - --HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer \ -+HOSTOPTFLAGS = -O2 -fomit-frame-pointer -+HOSTCFLAGS = -Wall -Wstrict-prototypes $(HOSTOPTFLAGS) \ - $(HOSTCPPFLAGS) - HOSTSTRIP = strip - -- GitLab