diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-22 12:42:11 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-22 12:42:11 +0200 |
commit | 2c84de509054d770081084ca223f55b67ef945db (patch) | |
tree | 3ea01066e0499e567f7c6c89c62e45a8118dab19 /toolchain/glibc | |
parent | dfedf6631eaf8c669ec141f4cb1d21f93399a310 (diff) | |
parent | 7a9453732c3443e61615a5ac08555c0f1fb4f495 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain/glibc')
-rw-r--r-- | toolchain/glibc/Makefile | 3 | ||||
-rw-r--r-- | toolchain/glibc/patches/mips64.patch | 26 |
2 files changed, 2 insertions, 27 deletions
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index e1b48f4e9..36d6f1214 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -36,7 +36,8 @@ GLIBC_ENV:= PATH='${TARGET_PATH}' \ LD=${REAL_GNU_TARGET_NAME}-ld \ libc_cv_forced_unwind=yes \ libc_cv_c_cleanup=yes \ - libc_cv_gnu99_inline=yes + libc_cv_gnu99_inline=yes \ + libc_cv_slibdir="/lib" ifeq ($(ADK_DEVICE_NO_FPU),y) GLIBC_CONFOPTS+= --without-fp diff --git a/toolchain/glibc/patches/mips64.patch b/toolchain/glibc/patches/mips64.patch index 04743e09d..0b53244b9 100644 --- a/toolchain/glibc/patches/mips64.patch +++ b/toolchain/glibc/patches/mips64.patch @@ -30,29 +30,3 @@ diff -Nur glibc-2.10-current.orig/ports/sysdeps/mips/preconfigure glibc-2.10-cur fi ;; mips*) base_machine=mips machine=mips/mips32/$machine ;; -diff -Nur glibc-2.10-current.orig/ports/sysdeps/unix/sysv/linux/mips/configure glibc-2.10-current/ports/sysdeps/unix/sysv/linux/mips/configure ---- glibc-2.10-current.orig/ports/sysdeps/unix/sysv/linux/mips/configure 2009-05-26 22:53:29.000000000 +0200 -+++ glibc-2.10-current/ports/sysdeps/unix/sysv/linux/mips/configure 2009-05-27 20:34:25.000000000 +0200 -@@ -84,22 +84,6 @@ - # and libc_cv_localedir. - test -n "$libc_cv_slibdir" || \ - case $machine in -- mips/mips64/n64/* ) -- libc_cv_slibdir="/lib64" -- if test "$libdir" = '${exec_prefix}/lib'; then -- libdir='${exec_prefix}/lib64'; -- # Locale data can be shared between 32bit and 64bit libraries -- libc_cv_localedir='${exec_prefix}/lib/locale' -- fi -- ;; -- mips/mips64/n32/* ) -- libc_cv_slibdir="/lib32" -- if test "$libdir" = '${exec_prefix}/lib'; then -- libdir='${exec_prefix}/lib32'; -- # Locale data can be shared between 32bit and 64bit libraries -- libc_cv_localedir='${exec_prefix}/lib/locale' -- fi -- ;; - *) - libc_cv_slibdir="/lib" - ;; |