X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fbusybox%2FMakefile;h=714d0c46527cb252321ea85af4dcf466a040f3b1;hb=f82546764a4cdabbdc226b73f2c7c44b1818edd3;hp=b0f0fc8f287078f08befb4fd33859b47af1f30d2;hpb=7618cd7cbe66065b4c185d0805e8982504bee237;p=openwrt%2Fopenwrt.git diff --git a/package/busybox/Makefile b/package/busybox/Makefile index b0f0fc8f28..714d0c4652 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,18 +4,17 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=busybox -PKG_VERSION:=1.11.3 -PKG_RELEASE:=4 +PKG_VERSION:=1.15.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.busybox.net/downloads \ http://distfiles.gentoo.org/distfiles/ -PKG_MD5SUM:=4355ad8bb57ce3b39ad827566c1a6da3 +PKG_MD5SUM:=6059ac9456de6fb18dc8ee4cd0ec9240 include $(INCLUDE_DIR)/package.mk @@ -60,6 +59,10 @@ define Build/Configure oldconfig endef +ifdef CONFIG_GCC_VERSION_LLVM + TARGET_CFLAGS += -fnested-functions +endif + define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ @@ -67,20 +70,22 @@ define Build/Compile KBUILD_HAVE_NLS=no \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ ARCH="$(ARCH)" \ + SKIP_STRIP=y \ all -endef - -define Package/busybox/install + rm -rf $(PKG_INSTALL_DIR) $(FIND) $(PKG_BUILD_DIR) -lname "*busybox" -exec rm \{\} \; $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ ARCH="$(ARCH)" \ - IPKG_ARCH="$(ARCH)" \ - CONFIG_PREFIX="$(1)" \ + CONFIG_PREFIX="$(PKG_INSTALL_DIR)" \ install +endef + +define Package/busybox/install $(INSTALL_DIR) $(1)/etc/init.d + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ for tmp in $(init-y); do \ $(INSTALL_BIN) ./files/$$$$tmp $(1)/etc/init.d/$$$$tmp; \ done