X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1ee0813a713bcc9d88e55ea18aaa7d45b68ecdcc..271da7f4e93492f377c0fcf25def4591d60b9fbc:/package/busybox/Makefile?ds=inline diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 2ac67098f..84d70990a 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -9,19 +9,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=busybox PKG_VERSION:=1.17.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 +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_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) - STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep '^CONFIG_BUSYBOX_' $(TOPDIR)/.config | md5s) + STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell $(SH_FUNC) grep '^CONFIG_BUSYBOX_' $(TOPDIR)/.config | md5s) endif init-y := @@ -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,8 +65,11 @@ 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 define Build/Compile @@ -74,6 +80,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 +90,7 @@ define Build/Compile EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ ARCH="$(ARCH)" \ CONFIG_PREFIX="$(PKG_INSTALL_DIR)" \ + LDLIBS="$(LDLIBS)" \ install endef