From 8171f3fbb7b85ed7940b6605a2ab34f204f5107c Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 10 Jun 2012 22:24:24 +0000 Subject: [PATCH] busybox: remove BUSYBOX_USE_LIBRPC git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32175 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/busybox/Config.in | 4 ---- package/busybox/Makefile | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package/busybox/Config.in b/package/busybox/Config.in index a954a25c8..88d1aa213 100644 --- a/package/busybox/Config.in +++ b/package/busybox/Config.in @@ -19,10 +19,6 @@ config BUSYBOX_CONFIG_HUSH default y if NOMMU default n if !NOMMU -config BUSYBOX_USE_LIBRPC - bool - default y if BUSYBOX_CONFIG_FEATURE_HAVE_RPC - source "package/busybox/config/Config.in" endif diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 1d2d7b4fa..ef7f51877 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads \ http://distfiles.gentoo.org/distfiles/ PKG_MD5SUM:=9c0cae5a0379228e7b55e5b29528df8e -PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc +PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_FEATURE_HAVE_RPC:librpc PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -37,7 +37,7 @@ define Package/busybox MAINTAINER:=Nicolas Thill TITLE:=Core utilities for embedded Linux URL:=http://busybox.net/ - DEPENDS:=+BUSYBOX_USE_LIBRPC:librpc + DEPENDS:=+BUSYBOX_CONFIG_FEATURE_HAVE_RPC:librpc MENU:=1 endef @@ -66,7 +66,7 @@ ifdef CONFIG_GCC_VERSION_LLVM endif LDLIBS:=m crypt -ifdef CONFIG_BUSYBOX_USE_LIBRPC +ifdef CONFIG_BUSYBOX_CONFIG_FEATURE_HAVE_RPC TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include export LDFLAGS=$(TARGET_LDFLAGS) LDLIBS += rpc