diff options
| -rw-r--r-- | package/mksh/files/mksh.conffiles | 2 | ||||
| -rw-r--r-- | toolchain/gcc/patches/no-lib64.patch | 20 |
2 files changed, 17 insertions, 5 deletions
diff --git a/package/mksh/files/mksh.conffiles b/package/mksh/files/mksh.conffiles index f139f0b55..dec964050 100644 --- a/package/mksh/files/mksh.conffiles +++ b/package/mksh/files/mksh.conffiles @@ -1 +1 @@ -/.mkshrc +/root/.mkshrc diff --git a/toolchain/gcc/patches/no-lib64.patch b/toolchain/gcc/patches/no-lib64.patch index a46e0aa67..880f5dbd8 100644 --- a/toolchain/gcc/patches/no-lib64.patch +++ b/toolchain/gcc/patches/no-lib64.patch @@ -1,6 +1,6 @@ diff -Nur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h --- gcc-4.4.0.orig/gcc/config/i386/linux64.h 2009-04-10 01:23:07.000000000 +0200 -+++ gcc-4.4.0/gcc/config/i386/linux64.h 2009-06-02 22:38:29.054028385 +0200 ++++ gcc-4.4.0/gcc/config/i386/linux64.h 2009-06-19 15:43:10.419891589 +0200 @@ -59,7 +59,7 @@ done. */ @@ -12,7 +12,7 @@ diff -Nur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/lin #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \ diff -Nur gcc-4.4.0.orig/gcc/config/i386/t-linux64 gcc-4.4.0/gcc/config/i386/t-linux64 --- gcc-4.4.0.orig/gcc/config/i386/t-linux64 2008-07-02 17:59:19.000000000 +0200 -+++ gcc-4.4.0/gcc/config/i386/t-linux64 2009-06-02 22:40:00.800873792 +0200 ++++ gcc-4.4.0/gcc/config/i386/t-linux64 2009-06-19 15:43:10.419891589 +0200 @@ -7,7 +7,7 @@ MULTILIB_OPTIONS = m64/m32 @@ -22,9 +22,21 @@ diff -Nur gcc-4.4.0.orig/gcc/config/i386/t-linux64 gcc-4.4.0/gcc/config/i386/t-l LIBGCC = stmp-multilib INSTALL_LIBGCC = install-multilib +diff -Nur gcc-4.4.0.orig/gcc/config/linux.h gcc-4.4.0/gcc/config/linux.h +--- gcc-4.4.0.orig/gcc/config/linux.h 2009-04-10 01:23:07.000000000 +0200 ++++ gcc-4.4.0/gcc/config/linux.h 2009-06-19 15:42:51.508828335 +0200 +@@ -119,7 +119,7 @@ + supporting both 32-bit and 64-bit compilation. */ + #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" + #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" +-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" ++#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld-uClibc.so.0" + #define LINUX_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) + #define LINUX_DYNAMIC_LINKER32 \ diff -Nur gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/linux64.h --- gcc-4.4.0.orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100 -+++ gcc-4.4.0/gcc/config/mips/linux64.h 2009-06-02 22:40:46.756972667 +0200 ++++ gcc-4.4.0/gcc/config/mips/linux64.h 2009-06-19 15:43:10.419891589 +0200 @@ -36,7 +36,7 @@ %{profile:-lc_p} %{!profile:-lc}}" @@ -36,7 +48,7 @@ diff -Nur gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/lin #define LINUX_DYNAMIC_LINKERN32 \ diff -Nur gcc-4.4.0.orig/gcc/config/mips/t-linux64 gcc-4.4.0/gcc/config/mips/t-linux64 --- gcc-4.4.0.orig/gcc/config/mips/t-linux64 2006-06-06 14:51:24.000000000 +0200 -+++ gcc-4.4.0/gcc/config/mips/t-linux64 2009-06-02 22:35:11.634464615 +0200 ++++ gcc-4.4.0/gcc/config/mips/t-linux64 2009-06-19 15:43:10.419891589 +0200 @@ -1,6 +1,6 @@ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 MULTILIB_DIRNAMES = n32 32 64 |