diff options
Diffstat (limited to 'package/busybox')
| -rw-r--r-- | package/busybox/Config.in.manual | 2 | ||||
| -rw-r--r-- | package/busybox/Makefile | 8 | ||||
| -rw-r--r-- | package/busybox/config/networking/Config.in | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual index a26169686..ffba6e89b 100644 --- a/package/busybox/Config.in.manual +++ b/package/busybox/Config.in.manual @@ -8,8 +8,6 @@ config ADK_PACKAGE_BUSYBOX boolean select ADK_COMPILE_BUSYBOX default y if !ADK_TOOLCHAIN_ONLY - select ADK_PACKAGE_LIBTIRPC - select ADK_PACKAGE_LIBPTHREAD help Core utilities for embedded Linux systems diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 6b40bf082..34b274d96 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= e025414bc6cd79579cc7a32a45d3ae1c PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base -PKG_BUILDDEP:= libtirpc +#PKG_BUILDDEP:= libtirpc PKG_URL:= http://www.busybox.net/ PKG_SITES:= http://www.busybox.net/downloads/ @@ -37,11 +37,11 @@ INSTALL_STYLE:= manual BB_MAKE_FLAGS:= V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \ HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \ - -C ${WRKBUILD} + -C ${WRKBUILD} ifneq (${ADK_NATIVE},y) -BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-pthread -ltirpc' EXTRA_CPPFLAGS="-I$(STAGING_DIR)/usr/include/tirpc" +BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc' else -BB_MAKE_FLAGS+= EXTRA_CPPFLAGS="-I/usr/include/tirpc" +BB_MAKE_FLAGS+= EXTRA_LDFLAGS="-static-libgcc" endif # XXX: Although this looks like all new symbols are enabled when 'make oldconfig' runs, they're not. diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 18355025f..233ee996d 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -551,7 +551,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_EXTERNAL_DHCP config BUSYBOX_INETD bool "inetd" - default y + default n select BUSYBOX_FEATURE_SYSLOG help Internet superserver daemon @@ -593,7 +593,7 @@ config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN config BUSYBOX_FEATURE_INETD_RPC bool "Support RPC services" - default y + default n depends on BUSYBOX_INETD select BUSYBOX_FEATURE_HAVE_RPC help |