wok-6.x rev 12911
glibc-base: ARM use Eglibc and files in sysroot with standard paths
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Tue May 29 17:48:30 2012 +0000 (2012-05-29) |
parents | 678455567f02 |
children | 570db404a047 |
files | glibc-base/receipt glibc-base/stuff/arm-files.list |
line diff
1.1 --- a/glibc-base/receipt Tue May 29 18:59:34 2012 +0200 1.2 +++ b/glibc-base/receipt Tue May 29 17:48:30 2012 +0000 1.3 @@ -14,7 +14,8 @@ 1.4 1.5 # Handle multiarch compilation. 1.6 case "$ARCH" in 1.7 - arm|x86_64) VERSION="2.13" WANTED="" ;; 1.8 + arm) VERSION="2.13" WANTED="" ;; 1.9 + x86_64) VERSION="2.13" WANTED="" ;; 1.10 esac 1.11 1.12 # Rules to gen a SliTaz package suitable for Tazpkg. 1.13 @@ -43,7 +44,34 @@ 1.14 done 1.15 1.16 case "$ARCH" in 1.17 - arm|x86_64) 1.18 + arm) 1.19 + # Eglibc is cross compiled by cross to have a toolchain so we can 1.20 + # use these files instead of recooking it. ARM use Eglibc 1.21 + echo "Using cross compiled Eglibc..." 1.22 + install=/cross/$ARCH/sysroot 1.23 + 1.24 + # /usr/{bin,share} /usr/lib/gconv 1.25 + for file in $(cat $stuff/arm-files.list) 1.26 + do 1.27 + cp -a ${install}$file ${fs}$file 1.28 + done 1.29 + 1.30 + # libs 1.31 + for lib in libcrypt libm libc libresolv librt libutil libpthread \ 1.32 + libnss_* libnsl libanl libdl 1.33 + do 1.34 + cp -a $install/lib/${lib}-*.so $fs/lib 1.35 + cp -a $install/lib/${lib}.so* $fs/lib 1.36 + cp -a $install/usr/lib/${lib}.so $fs/usr/lib 1.37 + done 1.38 + cp -a $install/lib/ld-*.so* $fs/lib 1.39 + cp -a $install/usr/lib/libc_nonshared.a $fs/usr/lib 1.40 + cp -a $install/usr/lib/libpthread_nonshared.a $fs/usr/lib 1.41 + cp $install/etc/rpc $fs/etc 1.42 + touch $fs/etc/ld.so.conf 1.43 + touch $fs/etc/ld.so.cache 1.44 + get_locales "usr/share" ;; 1.45 + x86_64) 1.46 # EXPERIMENTAL: Glibc is cross compiled by cross to have a 1.47 # toolchain so we can use these files instead of recooking it. 1.48 echo "Using cross compiled Glibc..." 1.49 @@ -100,16 +128,4 @@ 1.50 GROUP ( $root/lib/libc.so.6 $root/lib/libc_nonshared.a AS_NEEDED ( $root/lib/ld-linux-x86-64.so.2 ) ) 1.51 EOT 1.52 fi 1.53 - # ARM 1.54 - if echo $root | grep -q /usr/cross/arm; then 1.55 - echo "Fixing arm: $root/lib/libc.so" 1.56 - cat > $root/lib/libc.so << EOT 1.57 -OUTPUT_FORMAT(elf32-littlearm) 1.58 -GROUP ( $root/lib/libc.so.6 $root/lib/libc_nonshared.a AS_NEEDED ( $root/lib/ld-linux.so.3 ) ) 1.59 -EOT 1.60 - cat > $root/lib/libpthread.so << EOT 1.61 -OUTPUT_FORMAT(elf32-littlearm) 1.62 -GROUP ( $root/lib/libpthread.so.0 $root/lib/libpthread_nonshared.a ) 1.63 -EOT 1.64 - fi 1.65 }
2.1 --- a/glibc-base/stuff/arm-files.list Tue May 29 18:59:34 2012 +0200 2.2 +++ b/glibc-base/stuff/arm-files.list Tue May 29 17:48:30 2012 +0000 2.3 @@ -1,25 +1,39 @@ 2.4 -/lib/gconv/UNICODE.so 2.5 -/lib/gconv/gconv-modules 2.6 -/lib/gconv/ANSI_X3.110.so 2.7 -/lib/gconv/ISO8859-1.so 2.8 -/lib/gconv/CP1252.so 2.9 +/usr/lib/gconv/UNICODE.so 2.10 +/usr/lib/gconv/gconv-modules 2.11 +/usr/lib/gconv/ANSI_X3.110.so 2.12 +/usr/lib/gconv/ISO8859-1.so 2.13 +/usr/lib/gconv/CP1252.so 2.14 2.15 -/bin/locale 2.16 -/bin/localedef 2.17 +/usr/bin/locale 2.18 +/usr/bin/localedef 2.19 +/usr/bin/makedb 2.20 2.21 -/share/locale/locale.alias 2.22 -/share/i18n/charmaps/UTF-8.gz 2.23 +/usr/share/locale/locale.alias 2.24 +/usr/share/i18n/charmaps/UTF-8.gz 2.25 2.26 -/share/i18n/locales/i18n 2.27 -/share/i18n/locales/iso14651_t1 2.28 -/share/i18n/locales/iso14651_t1_common 2.29 -/share/i18n/locales/translit_neutral 2.30 -/share/i18n/locales/translit_combining 2.31 -/share/i18n/locales/translit_circle 2.32 -/share/i18n/locales/translit_cjk_compat 2.33 -/share/i18n/locales/translit_compat 2.34 -/share/i18n/locales/translit_font 2.35 -/share/i18n/locales/translit_fraction 2.36 -/share/i18n/locales/translit_narrow 2.37 -/share/i18n/locales/translit_small 2.38 -/share/i18n/locales/translit_wide 2.39 +/usr/share/i18n/locales/i18n 2.40 +/usr/share/i18n/locales/iso14651_t1 2.41 +/usr/share/i18n/locales/iso14651_t1_common 2.42 +/usr/share/i18n/locales/translit_neutral 2.43 +/usr/share/i18n/locales/translit_combining 2.44 +/usr/share/i18n/locales/translit_circle 2.45 +/usr/share/i18n/locales/translit_cjk_compat 2.46 +/usr/share/i18n/locales/translit_compat 2.47 +/usr/share/i18n/locales/translit_font 2.48 +/usr/share/i18n/locales/translit_fraction 2.49 +/usr/share/i18n/locales/translit_narrow 2.50 +/usr/share/i18n/locales/translit_small 2.51 +/usr/share/i18n/locales/translit_wide 2.52 + 2.53 +/usr/share/zoneinfo/Europe/Madrid 2.54 +/usr/share/zoneinfo/Europe/Moscow 2.55 +/usr/share/zoneinfo/Europe/London 2.56 +/usr/share/zoneinfo/Europe/Zurich 2.57 +/usr/share/zoneinfo/Europe/Paris 2.58 +/usr/share/zoneinfo/UTC 2.59 +/usr/share/zoneinfo/CET 2.60 +/usr/share/zoneinfo/America/Montreal 2.61 +/usr/share/zoneinfo/America/New_York 2.62 +/usr/share/zoneinfo/America/Los_Angeles 2.63 +/usr/share/zoneinfo/America/Sao_Paulo 2.64 +/usr/share/zoneinfo/America/Mexico_City