diff options
| -rw-r--r-- | sys-apps/busybox/files/busybox-1.00_rc3-amd64.patch | 22 | ||||
| -rw-r--r-- | sys-apps/busybox/files/busybox-cmdedit-sparc.diff | 12 | ||||
| -rw-r--r-- | sys-apps/busybox/files/dodeps | 47 |
3 files changed, 0 insertions, 81 deletions
diff --git a/sys-apps/busybox/files/busybox-1.00_rc3-amd64.patch b/sys-apps/busybox/files/busybox-1.00_rc3-amd64.patch deleted file mode 100644 index d596f5815273..000000000000 --- a/sys-apps/busybox/files/busybox-1.00_rc3-amd64.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur busybox-1.00-rc3.orig/modutils/insmod.c busybox-1.00-rc3/modutils/insmod.c ---- busybox-1.00-rc3.orig/modutils/insmod.c 2004-07-20 08:43:57.000000000 -0700 -+++ busybox-1.00-rc3/modutils/insmod.c 2004-09-20 07:47:17.818776178 -0700 -@@ -148,6 +148,18 @@ - #define ELFCLASSM ELFCLASS32 - #endif - -+#if defined(__x86_64__) -+#define BB_USE_GOT_ENTRIES -+#define BB_GOT_ENTRY_SIZE 8 -+#define BB_USE_SINGLE -+ -+#define MATCH_MACHINE(x) (x == EM_X86_64) -+ -+#define SHT_RELM SHT_RELA -+#define Elf64_RelM Elf64_Rela -+#define ELFCLASSM ELFCLASS64 -+#endif -+ - #if defined(__mc68000__) - #define CONFIG_USE_GOT_ENTRIES - #define CONFIG_GOT_ENTRY_SIZE 4 diff --git a/sys-apps/busybox/files/busybox-cmdedit-sparc.diff b/sys-apps/busybox/files/busybox-cmdedit-sparc.diff deleted file mode 100644 index 299161cf179f..000000000000 --- a/sys-apps/busybox/files/busybox-cmdedit-sparc.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru busybox-0.60.5-orig/cmdedit.c busybox-0.60.5/cmdedit.c ---- busybox-0.60.5-orig/cmdedit.c Thu Apr 25 01:07:03 2002 -+++ busybox-0.60.5/cmdedit.c Fri Apr 4 19:55:30 2003 -@@ -1177,7 +1177,7 @@ - new_settings.c_lflag &= ~ICANON; /* unbuffered input */ - /* Turn off echoing and CTRL-C, so we can trap it */ - new_settings.c_lflag &= ~(ECHO | ECHONL | ISIG); --#ifndef linux -+#if (defined(__sparc__) && defined(linux)) || ! defined(linux) - /* Hmm, in linux c_cc[] not parsed if set ~ICANON */ - new_settings.c_cc[VMIN] = 1; - new_settings.c_cc[VTIME] = 0; diff --git a/sys-apps/busybox/files/dodeps b/sys-apps/busybox/files/dodeps deleted file mode 100644 index 898e5b367cf2..000000000000 --- a/sys-apps/busybox/files/dodeps +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# dodeps: find dependencies in busybox applets. -# v0.1 -# Comments/ideas are welcome: wmertens@gentoo.org - -[ ! -f Config.h ] && echo you need to run this from the main source && exit -if [ ! -f deps ]; then - cat <<EOF - -This program will compile all applets with the BB_FEATURE definitions you gave. -Then, it will find the dependencies in them, and save them in the file "deps". -Then, it will calculate the applets you can activate with the same set of -function dependencies. It will also give an estimate of the added code size. - -This can then be used to make more informed decisions about what you want in -the busybox. - -If you don't like this, press ctrl-c now, otherwise press enter. -EOF - read a - - # Compile everything - mv Config.h Config.h.orig - awk '{if ($0~/^\/\/#define BB_/ && $0!~/FEATURE/){print substr($0,3)}else{print}}' Config.h.orig > Config.h - make -j2 - - # Get dependencies and sizes - export CC=gcc - for i in `./busybox.sh Config.h|sed 's/\.c/.o/g'`; do echo -n ${i%%.o} \(`size $i|awk /$i'/{print $(NF-2)}'`\):\ ; nm -p $i|awk '$1=="U"{a[i++]=$2}END{n=asort(a);for(i=1;i<=n;i++){printf a[i] " "}}'; echo; done > deps - mv Config.h.orig Config.h -fi - -# Calculate suggestions -my_apps=`gcc -E -dM Config.h | awk '{if ($0~/^#define BB_/ && $0!~/FEATURE/){if(t==1){printf "|"}; printf "^" tolower(substr($2,4)) " "; t=1}}'` -egrep "$my_apps" deps | awk '{for(i=3;i<=NF;i++){print $i}}'|sort -u > used_funcs -egrep -v "$my_apps" deps | awk '{for(i=3;i<=NF;i++){print $i}}'|sort -u > used_funcs_other -join -v2 used_funcs used_funcs_other > new_funcs -rm used_funcs used_funcs_other - -# Show results -echo "These applets share the same functions (code sizes are estimates)" -egrep -v "$my_apps" deps | egrep -v -f new_funcs | sed 's/^\([^ ]*\) (\([0-9]*\)).*/\2\t\1/' | sort -n -echo -echo You can find the temporary results in: -echo deps: all dependencies, new_funcs: unused functions -echo If you run this script again, it will use the previous calculations, -echo instead of compiling all applets again. |