wok-next diff glibc/receipt @ rev 13944
xorg-xauth: add common path (thanks mojo)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Jan 29 09:43:35 2013 +0100 (2013-01-29) |
parents | 52fadc2d223d |
children | 380ffe05937a |
line diff
1.1 --- a/glibc/receipt Tue Mar 06 00:02:58 2012 +0100 1.2 +++ b/glibc/receipt Tue Jan 29 09:43:35 2013 +0100 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="glibc" 1.7 -VERSION="2.13" 1.8 +VERSION="2.14.1" 1.9 CATEGORY="meta" 1.10 SHORT_DESC="The GNU C libraries. This package is used to compile the libc." 1.11 MAINTAINER="pankso@slitaz.org" 1.12 @@ -10,7 +10,7 @@ 1.13 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 1.14 1.15 DEPENDS="glibc-base glibc-locale glibc-dev" 1.16 -BUILD_DEPENDS="linux-api-headers" 1.17 +BUILD_DEPENDS="linux-api-headers autoconf bash" 1.18 1.19 # Genpkg order for tazwok. 1.20 COOK_OPT="genpkg=glibc-base:glibc-extra-samba:glib-locale:glibc-dev" 1.21 @@ -20,8 +20,12 @@ 1.22 { 1.23 cd $src 1.24 1.25 - # Fix a bug that prevents Glibc from building with GCC-4.5.2: 1.26 - patch -Np1 -i $stuff/glibc-2.13-gcc_fix-1.patch 1.27 + # Glibc Bug Fixes Patch from LFS 1.28 + patch -Np1 -i $stuff/glibc-2.14.1-fixes-1.patch 1.29 + # Glibc Bug Sort Relocatable Objects Patch 1.30 + patch -Np1 -i $stuff/glibc-2.14.1-sort-1.patch 1.31 + # Fix a bug that prevents Glibc from building with GCC-4.6.2 1.32 + patch -Np1 -i stuff/glibc-2.14.1-gcc_fix-1.patch 1.33 1.34 # Build in a separate directory. 1.35 mkdir ../glibc-build && cd ../glibc-build 1.36 @@ -66,17 +70,27 @@ 1.37 [ -d "/var/lib/tazpkg/installed/gawk" ] || tazpkg get-install gawk 1.38 fi 1.39 1.40 - # Following patches and sed fixes comes from LFS development book: 1.41 - # http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html 1.42 - DL=$(readelf -l /bin/sh | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p') 1.43 - sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|" \ 1.44 - scripts/test-installation.pl 1.45 - unset DL 1.46 + # Fixes and patches from LFS, Redhat 1.47 sed -i -e 's/"db1"/& \&\& $name ne "nss_test1"/' scripts/test-installation.pl 1.48 sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in 1.49 1.50 - # Fix a bug that prevents Glibc from building with GCC-4.5.2: 1.51 - patch -Np1 -i $stuff/glibc-2.13-gcc_fix-1.patch 1.52 + # Glibc misc Bug Fixes 1.53 + patch -Np1 -i $stuff/glibc-2.14.1-fixes-1.patch 1.54 + 1.55 + # Glibc Bug Sort Relocatable Objects Patch 1.56 + #patch -Np1 -i $stuff/glibc-2.14.1-sort-1.patch 1.57 + 1.58 + # Fix a bug that prevents Glibc from building with GCC-4.6.2 1.59 + patch -Np1 -i $stuff/glibc-2.14.1-gcc_fix-1.patch 1.60 + 1.61 + # Revert commit causing issues with crappy DNS servers 1.62 + patch -Np1 -i $stuff/glibc-2.14-revert-4768ae77.patch 1.63 + 1.64 + # re-export RPC interface until libtirpc is ready as a replacement 1.65 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) 1.66 + patch -Np1 -i $stuff/glibc-2.14-reexport-rpc-interface.patch 1.67 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) 1.68 + patch -Np1 -i $stuff/glibc-2.14-reinstall-nis-rpc-headers.patch 1.69 1.70 # Fix a stack imbalance that occurs under some conditions: 1.71 sed -i '195,213 s/PRIVATE_FUTEX/FUTEX_CLOCK_REALTIME/' \ 1.72 @@ -105,7 +119,8 @@ 1.73 --enable-kernel=2.6.30 \ 1.74 --libexecdir=/usr/lib/glibc \ 1.75 --build=$HOST_SYSTEM \ 1.76 - --host=$HOST_SYSTEM && 1.77 + --host=$HOST_SYSTEM \ 1.78 + --target=$BUILD_SYSTEM && 1.79 make && make install_root=$DESTDIR install 1.80 } || return 1 1.81