From fb6adb13ac8fde5033182d1d1a1744a665ef88b0 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Tue, 9 Mar 2010 22:17:38 +0000 Subject: Updating busybox. I left only a single busybox in its directory. The others, coming from the old cross-building nixpkgs implementation, were not referenced anywhere. This new busybox builds natively, and also cross-builds with uclibc. I updated the uclibc config with a busybox defconfig requirement (something about RPC). I made the gcc-cross-wrapper properly set the dynamic loader to programs. After this, 'qemu-arm' can run the dynamically linked busybox cross built for armv5tel--linux-gnueabi. svn path=/nixpkgs/trunk/; revision=20514 --- pkgs/os-specific/linux/uclibc/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/os-specific/linux/uclibc') diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 0811e8e3e80..278db745d60 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation { -e 's@^RUNTIME_PREFIX.*@RUNTIME_PREFIX="/"@' \ -e 's@^DEVEL_PREFIX.*@DEVEL_PREFIX="/"@' \ -e 's@.*UCLIBC_HAS_WCHAR.*@UCLIBC_HAS_WCHAR=y@' \ + -e 's@.*UCLIBC_HAS_RPC.*@UCLIBC_HAS_RPC=y@' \ -e 's@.*DO_C99_MATH.*@DO_C99_MATH=y@' \ -e 's@.*UCLIBC_HAS_PROGRAM_INVOCATION_NAME.*@UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y@' \ ${configArmEABI} \ -- cgit 1.4.1