# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1338313710 0
# Node ID cb4299f34f9d4b7add476a544daf214536cf2b53
# Parent  678455567f02bb930765f46b678fdffb025117df
glibc-base: ARM use Eglibc and files in sysroot with standard paths

diff -r 678455567f02 -r cb4299f34f9d glibc-base/receipt
--- a/glibc-base/receipt	Tue May 29 18:59:34 2012 +0200
+++ b/glibc-base/receipt	Tue May 29 17:48:30 2012 +0000
@@ -14,7 +14,8 @@
 
 # Handle multiarch compilation.
 case "$ARCH" in
-	arm|x86_64) VERSION="2.13" WANTED="" ;;
+	arm) VERSION="2.13" WANTED="" ;;
+	x86_64) VERSION="2.13" WANTED="" ;;
 esac
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -43,7 +44,34 @@
 	done
 
 	case "$ARCH" in
-		arm|x86_64)
+		arm)
+			# Eglibc is cross compiled by cross to have a toolchain so we can
+			# use these files instead of recooking it. ARM use Eglibc
+			echo "Using cross compiled Eglibc..."
+			install=/cross/$ARCH/sysroot
+
+			# /usr/{bin,share} /usr/lib/gconv
+			for file in $(cat $stuff/arm-files.list)
+		    do
+		    	cp -a ${install}$file ${fs}$file
+		    done
+
+			# libs
+			for lib in libcrypt libm libc libresolv librt libutil libpthread \
+				libnss_* libnsl libanl libdl
+			do
+				cp -a $install/lib/${lib}-*.so $fs/lib
+				cp -a $install/lib/${lib}.so* $fs/lib
+				cp -a $install/usr/lib/${lib}.so $fs/usr/lib
+			done
+			cp -a $install/lib/ld-*.so* $fs/lib
+			cp -a $install/usr/lib/libc_nonshared.a $fs/usr/lib
+			cp -a $install/usr/lib/libpthread_nonshared.a $fs/usr/lib
+			cp $install/etc/rpc $fs/etc
+			touch $fs/etc/ld.so.conf
+			touch $fs/etc/ld.so.cache
+			get_locales "usr/share" ;;
+		x86_64)
 			# EXPERIMENTAL: Glibc is cross compiled by cross to have a
 			# toolchain so we can use these files instead of recooking it.
 			echo "Using cross compiled Glibc..."
@@ -100,16 +128,4 @@
 GROUP ( $root/lib/libc.so.6 $root/lib/libc_nonshared.a AS_NEEDED ( $root/lib/ld-linux-x86-64.so.2 ) )
 EOT
 	fi
-	# ARM
-	if echo $root | grep -q /usr/cross/arm; then
-		echo "Fixing arm: $root/lib/libc.so"
-		cat > $root/lib/libc.so << EOT
-OUTPUT_FORMAT(elf32-littlearm)
-GROUP ( $root/lib/libc.so.6 $root/lib/libc_nonshared.a AS_NEEDED ( $root/lib/ld-linux.so.3 ) )
-EOT
-		cat > $root/lib/libpthread.so << EOT
-OUTPUT_FORMAT(elf32-littlearm)
-GROUP ( $root/lib/libpthread.so.0 $root/lib/libpthread_nonshared.a )
-EOT
-	fi
 }
diff -r 678455567f02 -r cb4299f34f9d glibc-base/stuff/arm-files.list
--- a/glibc-base/stuff/arm-files.list	Tue May 29 18:59:34 2012 +0200
+++ b/glibc-base/stuff/arm-files.list	Tue May 29 17:48:30 2012 +0000
@@ -1,25 +1,39 @@
-/lib/gconv/UNICODE.so
-/lib/gconv/gconv-modules
-/lib/gconv/ANSI_X3.110.so
-/lib/gconv/ISO8859-1.so
-/lib/gconv/CP1252.so
+/usr/lib/gconv/UNICODE.so
+/usr/lib/gconv/gconv-modules
+/usr/lib/gconv/ANSI_X3.110.so
+/usr/lib/gconv/ISO8859-1.so
+/usr/lib/gconv/CP1252.so
 
-/bin/locale
-/bin/localedef
+/usr/bin/locale
+/usr/bin/localedef
+/usr/bin/makedb
 
-/share/locale/locale.alias
-/share/i18n/charmaps/UTF-8.gz
+/usr/share/locale/locale.alias
+/usr/share/i18n/charmaps/UTF-8.gz
 
-/share/i18n/locales/i18n
-/share/i18n/locales/iso14651_t1
-/share/i18n/locales/iso14651_t1_common
-/share/i18n/locales/translit_neutral
-/share/i18n/locales/translit_combining
-/share/i18n/locales/translit_circle
-/share/i18n/locales/translit_cjk_compat
-/share/i18n/locales/translit_compat
-/share/i18n/locales/translit_font
-/share/i18n/locales/translit_fraction
-/share/i18n/locales/translit_narrow
-/share/i18n/locales/translit_small
-/share/i18n/locales/translit_wide
+/usr/share/i18n/locales/i18n
+/usr/share/i18n/locales/iso14651_t1
+/usr/share/i18n/locales/iso14651_t1_common
+/usr/share/i18n/locales/translit_neutral
+/usr/share/i18n/locales/translit_combining
+/usr/share/i18n/locales/translit_circle
+/usr/share/i18n/locales/translit_cjk_compat
+/usr/share/i18n/locales/translit_compat
+/usr/share/i18n/locales/translit_font
+/usr/share/i18n/locales/translit_fraction
+/usr/share/i18n/locales/translit_narrow
+/usr/share/i18n/locales/translit_small
+/usr/share/i18n/locales/translit_wide
+
+/usr/share/zoneinfo/Europe/Madrid
+/usr/share/zoneinfo/Europe/Moscow
+/usr/share/zoneinfo/Europe/London
+/usr/share/zoneinfo/Europe/Zurich
+/usr/share/zoneinfo/Europe/Paris
+/usr/share/zoneinfo/UTC
+/usr/share/zoneinfo/CET
+/usr/share/zoneinfo/America/Montreal
+/usr/share/zoneinfo/America/New_York
+/usr/share/zoneinfo/America/Los_Angeles
+/usr/share/zoneinfo/America/Sao_Paulo
+/usr/share/zoneinfo/America/Mexico_City