wok rev 12835
Add xz and custom glibc-base to x86_64
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Tue May 22 18:12:44 2012 +0200 (2012-05-22) |
parents | b2cca7c91b35 |
children | 5f1254dc8217 |
files | glibc-base/receipt xz/receipt |
line diff
1.1 --- a/glibc-base/receipt Tue May 22 17:21:11 2012 +0200 1.2 +++ b/glibc-base/receipt Tue May 22 18:12:44 2012 +0200 1.3 @@ -7,14 +7,14 @@ 1.4 WEB_SITE="http://www.gnu.org/software/libc/" 1.5 MAINTAINER="pankso@slitaz.org" 1.6 WANTED="glibc" 1.7 -HOST_ARCH="i486 arm" 1.8 +HOST_ARCH="i486 arm x86_64" 1.9 1.10 # Locales include by default, other locales are in: glibc-locale 1.11 DEFAULT_LOCALE="de_DE en_US en_GB es_ES fr_FR it_IT pt_BR pt_PT ru_RU" 1.12 1.13 # Handle multiarch compilation. 1.14 case "$ARCH" in 1.15 - arm) VERSION="2.13" WANTED="" ;; 1.16 + arm|x86_64) VERSION="2.13" WANTED="" ;; 1.17 esac 1.18 1.19 # Rules to gen a SliTaz package suitable for Tazpkg. 1.20 @@ -26,11 +26,9 @@ 1.21 genpkg_rules() 1.22 { 1.23 case "$ARCH" in 1.24 - arm) 1.25 + arm|x86_64) 1.26 # EXPERIMENTAL: Glibc is cross compiled by cross to have a 1.27 # toolchain so we can use these files instead of recooking it. 1.28 - # 20120514: Include just minal libs for Busybox so we can create 1.29 - # bootable Qemu image for ARM. 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 @@ -56,7 +54,7 @@ 1.34 #cp -a $install/share/i18n/charmaps/UTF-8.gz \ 1.35 #$fs/usr/share/i18n/charmaps 1.36 # Fix libraries search path 1.37 - sed -i s'|/usr/cross/arm||'g $fs/lib/libc.so ;; 1.38 + sed -i s"|/usr/cross/$ARCH||"g $fs/lib/libc.so ;; 1.39 *) 1.40 # Mkdir's. 1.41 for dir in $(cat $stuff/mkdir.list) 1.42 @@ -88,8 +86,17 @@ 1.43 # to have /usr/cross/$ARCH search path in libc.so 1.44 post_install() 1.45 { 1.46 - if echo $root | grep -q /usr/cross; then 1.47 - echo "Fixing: $root/lib/libc.so" 1.48 + # x86_64 1.49 + if echo $root | grep -q /usr/cross/x86_64; then 1.50 + echo "Fixing x86_64: $root/lib/libc.so" 1.51 + cat > $root/lib/libc.so << EOT 1.52 +OUTPUT_FORMAT(elf64-x86-64) 1.53 +GROUP ( $root/lib/libc.so.6 $root/lib/libc_nonshared.a AS_NEEDED ( $root/lib/ld-linux-x86-64.so.2 ) ) 1.54 +EOT 1.55 + fi 1.56 + # ARM 1.57 + if echo $root | grep -q /usr/cross/arm; then 1.58 + echo "Fixing arm: $root/lib/libc.so" 1.59 cat > $root/lib/libc.so << EOT 1.60 OUTPUT_FORMAT(elf32-littlearm) 1.61 GROUP ( $root/lib/libc.so.6 $root/lib/libc_nonshared.a AS_NEEDED ( $root/lib/ld-linux.so.3 ) )
2.1 --- a/xz/receipt Tue May 22 17:21:11 2012 +0200 2.2 +++ b/xz/receipt Tue May 22 18:12:44 2012 +0200 2.3 @@ -10,7 +10,7 @@ 2.4 WEB_SITE="http://tukaani.org/xz" 2.5 WGET_URL="$WEB_SITE/$TARBALL" 2.6 PROVIDE="lzma" 2.7 -HOST_ARCH="i486 arm" 2.8 +HOST_ARCH="i486 arm x86_64" 2.9 2.10 # Rules to configure and make the package. 2.11 compile_rules()