X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f733f725d5939fdf4e95de1cebe2b3340b4cff2e..23bd1bd8c77ebd8ee5650b4b3bd45fae2adfc85d:/package/busybox/Makefile diff --git a/package/busybox/Makefile b/package/busybox/Makefile index c61e3f478..798934546 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,14 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=busybox -PKG_VERSION:=1.17.3 -PKG_RELEASE:=1 +PKG_VERSION:=1.19.3 +PKG_RELEASE:=6 +PKG_FLAGS:=essential PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.busybox.net/downloads \ http://distfiles.gentoo.org/distfiles/ -PKG_MD5SUM:=a2ce1a951571da8c6e0eaf75b1acef60 +PKG_MD5SUM:=c3938e1ac59602387009bbf1dd1af7f6 +PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -35,6 +37,7 @@ define Package/busybox MAINTAINER:=Nicolas Thill TITLE:=Core utilities for embedded Linux URL:=http://busybox.net/ + DEPENDS:=+BUSYBOX_USE_LIBRPC:librpc MENU:=1 endef @@ -62,10 +65,15 @@ ifdef CONFIG_GCC_VERSION_LLVM TARGET_CFLAGS += -fnested-functions endif -ifdef CONFIG_GCC_VERSION_4_5_0 - TARGET_CFLAGS += -fno-tree-pta +LDLIBS:=m crypt +ifdef CONFIG_BUSYBOX_USE_LIBRPC + TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include + export LDFLAGS=$(TARGET_LDFLAGS) + LDLIBS += rpc endif +TARGET_CFLAGS += -ggdb3 + define Build/Compile $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ @@ -74,6 +82,7 @@ define Build/Compile EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ ARCH="$(ARCH)" \ SKIP_STRIP=y \ + LDLIBS="$(LDLIBS)" \ all rm -rf $(PKG_INSTALL_DIR) $(FIND) $(PKG_BUILD_DIR) -lname "*busybox" -exec rm \{\} \; @@ -83,6 +92,7 @@ define Build/Compile EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ ARCH="$(ARCH)" \ CONFIG_PREFIX="$(PKG_INSTALL_DIR)" \ + LDLIBS="$(LDLIBS)" \ install endef