wok rev 12881
glibc: include locale files in ARM, more lib and improve receipt
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Fri May 25 23:24:13 2012 +0200 (2012-05-25) |
| parents | 8e557a05cf7f |
| children | f6382af837a6 |
| files | glibc-base/receipt glibc-base/stuff/arm-files.list glibc-base/stuff/i486-files.list glibc-base/stuff/wanted-files.list |
line diff
1.1 --- a/glibc-base/receipt Fri May 25 19:46:33 2012 +0200 1.2 +++ b/glibc-base/receipt Fri May 25 23:24:13 2012 +0200 1.3 @@ -23,56 +23,62 @@ 1.4 # informations). You can use the precompiled package available on 1.5 # SliTaz mirror to build a distro without recompiling glibc. 1.6 # 1.7 + 1.8 +# i18n 1.9 +get_locales() 1.10 +{ 1.11 + local path=$1 1.12 + for i in $DEFAULT_LOCALE 1.13 + do 1.14 + cp $install/$path/i18n/locales/$i $fs/usr/share/i18n/locales 1.15 + done 1.16 +} 1.17 + 1.18 genpkg_rules() 1.19 { 1.20 + # Mkdir's. 1.21 + for dir in $(cat $stuff/mkdir.list) 1.22 + do 1.23 + mkdir -p ${fs}$dir 1.24 + done 1.25 + 1.26 case "$ARCH" in 1.27 arm|x86_64) 1.28 # EXPERIMENTAL: Glibc is cross compiled by cross to have a 1.29 # toolchain so we can use these files instead of recooking it. 1.30 echo "Using cross compiled Glibc..." 1.31 install=/usr/cross/$ARCH 1.32 - mkdir -p $fs/lib $fs/etc $fs/usr/bin \ 1.33 - $fs/usr/lib/gconv $fs/usr/share/i18n/charmaps 1.34 - # /usr/bin 1.35 - for bin in locale localedef 1.36 - do 1.37 - cp $install/bin/$bin $fs/usr/bin 1.38 - done 1.39 + 1.40 + # /usr/{bin,share} /usr/lib/gconv 1.41 + for file in $(cat $stuff/arm-files.list) 1.42 + do 1.43 + cp -a ${install}$file ${fs}/usr/$file 1.44 + done 1.45 + 1.46 # /lib 1.47 - for lib in libcrypt libm libc libresolv librt libutil libpthread 1.48 + for lib in libcrypt libm libc libresolv librt libutil libpthread \ 1.49 + libnss_* libnsl libanl libdl 1.50 do 1.51 cp -a $install/lib/${lib}-*.so $fs/lib 1.52 cp -a $install/lib/${lib}.so* $fs/lib 1.53 done 1.54 cp -a $install/lib/ld-*.so* $fs/lib 1.55 - cp -a $install/lib/libnss_*.so* $fs/lib 1.56 cp -a $install/lib/libc_nonshared.a $fs/lib 1.57 + cp -a $install/lib/libpthread_nonshared.a $fs/lib 1.58 cp $install/etc/rpc $fs/etc 1.59 touch $fs/etc/ld.so.conf 1.60 - # i18n 1.61 - cp $install/lib/gconv/UNICODE.so $fs/usr/lib/gconv 1.62 - #cp -a $install/share/i18n/charmaps/UTF-8.gz \ 1.63 - #$fs/usr/share/i18n/charmaps 1.64 + get_locales "share" 1.65 # Fix libraries search path 1.66 - sed -i s"|/usr/cross/$ARCH||"g $fs/lib/libc.so ;; 1.67 + sed -i s"|/usr/cross/$ARCH||"g $fs/lib/libc.so 1.68 + sed -i s"|/usr/cross/$ARCH||"g $fs/lib/libpthread.so ;; 1.69 *) 1.70 - # Mkdir's. 1.71 - for dir in $(cat $stuff/mkdir.list) 1.72 - do 1.73 - mkdir -p ${fs}$dir 1.74 - done 1.75 # Copy all files specified in stuff/files.list. We get the files 1.76 # from glibc package. 1.77 for file in $(cat $stuff/wanted-files.list) 1.78 do 1.79 - cp -a ${_pkg}$file ${fs}$file 1.80 + cp -a ${install}$file ${fs}$file 1.81 done 1.82 - # i18n 1.83 - for i in $DEFAULT_LOCALE 1.84 - do 1.85 - cp $install/usr/share/i18n/locales/$i \ 1.86 - $fs/usr/share/i18n/locales 1.87 - done 1.88 + get_locales "usr/share" 1.89 esac 1.90 } 1.91 1.92 @@ -101,5 +107,9 @@ 1.93 OUTPUT_FORMAT(elf32-littlearm) 1.94 GROUP ( $root/lib/libc.so.6 $root/lib/libc_nonshared.a AS_NEEDED ( $root/lib/ld-linux.so.3 ) ) 1.95 EOT 1.96 + cat > $root/lib/libpthread.so << EOT 1.97 +OUTPUT_FORMAT(elf32-littlearm) 1.98 +GROUP ( $root/lib/libpthread.so.0 $root/lib/libpthread_nonshared.a ) 1.99 +EOT 1.100 fi 1.101 }
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/glibc-base/stuff/arm-files.list Fri May 25 23:24:13 2012 +0200 2.3 @@ -0,0 +1,25 @@ 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 + 2.10 +/bin/locale 2.11 +/bin/localedef 2.12 + 2.13 +/share/locale/locale.alias 2.14 +/share/i18n/charmaps/UTF-8.gz 2.15 + 2.16 +/share/i18n/locales/i18n 2.17 +/share/i18n/locales/iso14651_t1 2.18 +/share/i18n/locales/iso14651_t1_common 2.19 +/share/i18n/locales/translit_neutral 2.20 +/share/i18n/locales/translit_combining 2.21 +/share/i18n/locales/translit_circle 2.22 +/share/i18n/locales/translit_cjk_compat 2.23 +/share/i18n/locales/translit_compat 2.24 +/share/i18n/locales/translit_font 2.25 +/share/i18n/locales/translit_fraction 2.26 +/share/i18n/locales/translit_narrow 2.27 +/share/i18n/locales/translit_small 2.28 +/share/i18n/locales/translit_wide
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/glibc-base/stuff/i486-files.list Fri May 25 23:24:13 2012 +0200 3.3 @@ -0,0 +1,88 @@ 3.4 +/lib/libutil-2.14.1.so 3.5 +/lib/libnss_dns-2.14.1.so 3.6 +/lib/libnsl-2.14.1.so 3.7 +/lib/libanl-2.14.1.so 3.8 +/lib/libm-2.14.1.so 3.9 +/lib/libpthread-2.14.1.so 3.10 +/lib/libthread_db-1.0.so 3.11 +/lib/libnss_compat-2.14.1.so 3.12 +/lib/libc-2.14.1.so 3.13 +/lib/librt-2.14.1.so 3.14 +/lib/libcrypt-2.14.1.so 3.15 +/lib/ld-2.14.1.so 3.16 +/lib/libresolv-2.14.1.so 3.17 +/lib/libnss_files-2.14.1.so 3.18 +/lib/libdl-2.14.1.so 3.19 + 3.20 +/usr/lib/gconv/UNICODE.so 3.21 +/usr/lib/gconv/gconv-modules 3.22 +/usr/lib/gconv/ANSI_X3.110.so 3.23 +/usr/lib/gconv/ISO8859-1.so 3.24 +/usr/lib/gconv/UTF-16.so 3.25 +/usr/lib/gconv/CP1252.so 3.26 + 3.27 +/usr/bin/locale 3.28 +/usr/bin/localedef 3.29 + 3.30 +/usr/share/locale/locale.alias 3.31 +/usr/share/i18n/charmaps/UTF-8.gz 3.32 + 3.33 +/usr/share/i18n/locales/i18n 3.34 +/usr/share/i18n/locales/iso14651_t1 3.35 +/usr/share/i18n/locales/iso14651_t1_common 3.36 +/usr/share/i18n/locales/translit_neutral 3.37 +/usr/share/i18n/locales/translit_combining 3.38 +/usr/share/i18n/locales/translit_circle 3.39 +/usr/share/i18n/locales/translit_cjk_compat 3.40 +/usr/share/i18n/locales/translit_compat 3.41 +/usr/share/i18n/locales/translit_font 3.42 +/usr/share/i18n/locales/translit_fraction 3.43 +/usr/share/i18n/locales/translit_narrow 3.44 +/usr/share/i18n/locales/translit_small 3.45 +/usr/share/i18n/locales/translit_wide 3.46 + 3.47 +/usr/share/zoneinfo/Europe/Madrid 3.48 +/usr/share/zoneinfo/Europe/Moscow 3.49 +/usr/share/zoneinfo/Europe/London 3.50 +/usr/share/zoneinfo/Europe/Zurich 3.51 +/usr/share/zoneinfo/Europe/Paris 3.52 +/usr/share/zoneinfo/UTC 3.53 +/usr/share/zoneinfo/CET 3.54 +/usr/share/zoneinfo/America/Montreal 3.55 +/usr/share/zoneinfo/America/New_York 3.56 +/usr/share/zoneinfo/America/Los_Angeles 3.57 +/usr/share/zoneinfo/America/Sao_Paulo 3.58 +/usr/share/zoneinfo/America/Mexico_City 3.59 + 3.60 +/etc/rpc 3.61 +/etc/ld.so.conf 3.62 +/etc/ld.so.cache 3.63 + 3.64 +/lib/libc.so.6 3.65 +/lib/librt.so.1 3.66 +/lib/libdl.so.2 3.67 +/lib/libanl.so.1 3.68 +/lib/libutil.so.1 3.69 +/lib/libnss_dns.so.2 3.70 +/lib/libnss_compat.so.2 3.71 +/lib/libcrypt.so.1 3.72 +/lib/libpthread.so.0 3.73 +/lib/libthread_db.so.1 3.74 +/lib/libm.so.6 3.75 +/lib/ld-linux.so.2 3.76 +/lib/libresolv.so.2 3.77 +/lib/libnsl.so.1 3.78 +/lib/libnss_files.so.2 3.79 + 3.80 +/usr/lib/libnss_dns.so 3.81 +/usr/lib/libnss_files.so 3.82 +/usr/lib/libcrypt.so 3.83 +/usr/lib/libnss_compat.so 3.84 +/usr/lib/libdl.so 3.85 +/usr/lib/libm.so 3.86 +/usr/lib/librt.so 3.87 +/usr/lib/libresolv.so 3.88 +/usr/lib/libnsl.so 3.89 +/usr/lib/libutil.so 3.90 +/usr/lib/libanl.so 3.91 +/usr/lib/libthread_db.so
4.1 --- a/glibc-base/stuff/wanted-files.list Fri May 25 19:46:33 2012 +0200 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,88 +0,0 @@ 4.4 -/lib/libutil-2.14.1.so 4.5 -/lib/libnss_dns-2.14.1.so 4.6 -/lib/libnsl-2.14.1.so 4.7 -/lib/libanl-2.14.1.so 4.8 -/lib/libm-2.14.1.so 4.9 -/lib/libpthread-2.14.1.so 4.10 -/lib/libthread_db-1.0.so 4.11 -/lib/libnss_compat-2.14.1.so 4.12 -/lib/libc-2.14.1.so 4.13 -/lib/librt-2.14.1.so 4.14 -/lib/libcrypt-2.14.1.so 4.15 -/lib/ld-2.14.1.so 4.16 -/lib/libresolv-2.14.1.so 4.17 -/lib/libnss_files-2.14.1.so 4.18 -/lib/libdl-2.14.1.so 4.19 - 4.20 -/usr/lib/gconv/UNICODE.so 4.21 -/usr/lib/gconv/gconv-modules 4.22 -/usr/lib/gconv/ANSI_X3.110.so 4.23 -/usr/lib/gconv/ISO8859-1.so 4.24 -/usr/lib/gconv/UTF-16.so 4.25 -/usr/lib/gconv/CP1252.so 4.26 - 4.27 -/usr/bin/locale 4.28 -/usr/bin/localedef 4.29 - 4.30 -/usr/share/locale/locale.alias 4.31 -/usr/share/i18n/charmaps/UTF-8.gz 4.32 - 4.33 -/usr/share/i18n/locales/i18n 4.34 -/usr/share/i18n/locales/iso14651_t1 4.35 -/usr/share/i18n/locales/iso14651_t1_common 4.36 -/usr/share/i18n/locales/translit_neutral 4.37 -/usr/share/i18n/locales/translit_combining 4.38 -/usr/share/i18n/locales/translit_circle 4.39 -/usr/share/i18n/locales/translit_cjk_compat 4.40 -/usr/share/i18n/locales/translit_compat 4.41 -/usr/share/i18n/locales/translit_font 4.42 -/usr/share/i18n/locales/translit_fraction 4.43 -/usr/share/i18n/locales/translit_narrow 4.44 -/usr/share/i18n/locales/translit_small 4.45 -/usr/share/i18n/locales/translit_wide 4.46 - 4.47 -/usr/share/zoneinfo/Europe/Madrid 4.48 -/usr/share/zoneinfo/Europe/Moscow 4.49 -/usr/share/zoneinfo/Europe/London 4.50 -/usr/share/zoneinfo/Europe/Zurich 4.51 -/usr/share/zoneinfo/Europe/Paris 4.52 -/usr/share/zoneinfo/UTC 4.53 -/usr/share/zoneinfo/CET 4.54 -/usr/share/zoneinfo/America/Montreal 4.55 -/usr/share/zoneinfo/America/New_York 4.56 -/usr/share/zoneinfo/America/Los_Angeles 4.57 -/usr/share/zoneinfo/America/Sao_Paulo 4.58 -/usr/share/zoneinfo/America/Mexico_City 4.59 - 4.60 -/etc/rpc 4.61 -/etc/ld.so.conf 4.62 -/etc/ld.so.cache 4.63 - 4.64 -/lib/libc.so.6 4.65 -/lib/librt.so.1 4.66 -/lib/libdl.so.2 4.67 -/lib/libanl.so.1 4.68 -/lib/libutil.so.1 4.69 -/lib/libnss_dns.so.2 4.70 -/lib/libnss_compat.so.2 4.71 -/lib/libcrypt.so.1 4.72 -/lib/libpthread.so.0 4.73 -/lib/libthread_db.so.1 4.74 -/lib/libm.so.6 4.75 -/lib/ld-linux.so.2 4.76 -/lib/libresolv.so.2 4.77 -/lib/libnsl.so.1 4.78 -/lib/libnss_files.so.2 4.79 - 4.80 -/usr/lib/libnss_dns.so 4.81 -/usr/lib/libnss_files.so 4.82 -/usr/lib/libcrypt.so 4.83 -/usr/lib/libnss_compat.so 4.84 -/usr/lib/libdl.so 4.85 -/usr/lib/libm.so 4.86 -/usr/lib/librt.so 4.87 -/usr/lib/libresolv.so 4.88 -/usr/lib/libnsl.so 4.89 -/usr/lib/libutil.so 4.90 -/usr/lib/libanl.so 4.91 -/usr/lib/libthread_db.so