X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/396dbf68b1cfdce2e6f455b5ec646b4c5b65c55e..7a1551ae774b1b323b055197fe8fe30913b28a79:/package/busybox/Makefile?ds=inline diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 25828da97..bc2554b01 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2009 OpenWrt.org +# +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=busybox -PKG_VERSION:=1.12.4 -PKG_RELEASE:=1 +PKG_VERSION:=1.16.1 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.busybox.net/downloads \ http://distfiles.gentoo.org/distfiles/ -PKG_MD5SUM:=5b8c427bf596732d6b6156672e6e093f +PKG_MD5SUM:=319486ec65078d07fde26eb620fecde7 include $(INCLUDE_DIR)/package.mk @@ -30,6 +30,7 @@ init-$(CONFIG_BUSYBOX_CONFIG_TELNETD) += telnet define Package/busybox SECTION:=base CATEGORY:=Base system + MAINTAINER:=Nicolas Thill TITLE:=Core utilities for embedded Linux URL:=http://busybox.net/ MENU:=1 @@ -41,11 +42,7 @@ define Package/busybox/description endef define Package/busybox/config - menu "Configuration" - depends on PACKAGE_busybox - source "$(SOURCE)/target-config.in" - source "$(SOURCE)/config/Config.in" - endmenu + source "$(SOURCE)/Config.in" endef define Build/Configure @@ -59,6 +56,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)" \ @@ -66,6 +67,7 @@ define Build/Compile KBUILD_HAVE_NLS=no \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ ARCH="$(ARCH)" \ + SKIP_STRIP=y \ all rm -rf $(PKG_INSTALL_DIR) $(FIND) $(PKG_BUILD_DIR) -lname "*busybox" -exec rm \{\} \; @@ -74,7 +76,6 @@ define Build/Compile CROSS_COMPILE="$(TARGET_CROSS)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ ARCH="$(ARCH)" \ - IPKG_ARCH="$(ARCH)" \ CONFIG_PREFIX="$(PKG_INSTALL_DIR)" \ install endef