diff options
Diffstat (limited to 'base/glibc')
| -rw-r--r-- | base/glibc/.footprint | 82 | ||||
| -rw-r--r-- | base/glibc/.md5sum | 5 | ||||
| -rwxr-xr-x | base/glibc/Pkgfile | 21 |
3 files changed, 57 insertions, 51 deletions
diff --git a/base/glibc/.footprint b/base/glibc/.footprint index f9a220698..89b2a268a 100644 --- a/base/glibc/.footprint +++ b/base/glibc/.footprint @@ -5,49 +5,49 @@ lrwxrwxrwx root/root etc/localtime -> ../usr/share/zoneinfo/Factory -rw-r--r-- root/root etc/nsswitch.conf -rw-r--r-- root/root etc/rpc drwxr-xr-x root/root lib/ --rwxr-xr-x root/root lib/ld-2.11.1.so -lrwxrwxrwx root/root lib/ld-linux.so.2 -> ld-2.11.1.so --rwxr-xr-x root/root lib/libBrokenLocale-2.11.1.so -lrwxrwxrwx root/root lib/libBrokenLocale.so.1 -> libBrokenLocale-2.11.1.so +-rwxr-xr-x root/root lib/ld-2.11.2.so +lrwxrwxrwx root/root lib/ld-linux.so.2 -> ld-2.11.2.so +-rwxr-xr-x root/root lib/libBrokenLocale-2.11.2.so +lrwxrwxrwx root/root lib/libBrokenLocale.so.1 -> libBrokenLocale-2.11.2.so -rwxr-xr-x root/root lib/libSegFault.so --rwxr-xr-x root/root lib/libanl-2.11.1.so -lrwxrwxrwx root/root lib/libanl.so.1 -> libanl-2.11.1.so --rwxr-xr-x root/root lib/libc-2.11.1.so -lrwxrwxrwx root/root lib/libc.so.6 -> libc-2.11.1.so --rwxr-xr-x root/root lib/libcidn-2.11.1.so -lrwxrwxrwx root/root lib/libcidn.so.1 -> libcidn-2.11.1.so --rwxr-xr-x root/root lib/libcrypt-2.11.1.so -lrwxrwxrwx root/root lib/libcrypt.so.1 -> libcrypt-2.11.1.so --rwxr-xr-x root/root lib/libdl-2.11.1.so -lrwxrwxrwx root/root lib/libdl.so.2 -> libdl-2.11.1.so --rwxr-xr-x root/root lib/libm-2.11.1.so -lrwxrwxrwx root/root lib/libm.so.6 -> libm-2.11.1.so +-rwxr-xr-x root/root lib/libanl-2.11.2.so +lrwxrwxrwx root/root lib/libanl.so.1 -> libanl-2.11.2.so +-rwxr-xr-x root/root lib/libc-2.11.2.so +lrwxrwxrwx root/root lib/libc.so.6 -> libc-2.11.2.so +-rwxr-xr-x root/root lib/libcidn-2.11.2.so +lrwxrwxrwx root/root lib/libcidn.so.1 -> libcidn-2.11.2.so +-rwxr-xr-x root/root lib/libcrypt-2.11.2.so +lrwxrwxrwx root/root lib/libcrypt.so.1 -> libcrypt-2.11.2.so +-rwxr-xr-x root/root lib/libdl-2.11.2.so +lrwxrwxrwx root/root lib/libdl.so.2 -> libdl-2.11.2.so +-rwxr-xr-x root/root lib/libm-2.11.2.so +lrwxrwxrwx root/root lib/libm.so.6 -> libm-2.11.2.so -rwxr-xr-x root/root lib/libmemusage.so --rwxr-xr-x root/root lib/libnsl-2.11.1.so -lrwxrwxrwx root/root lib/libnsl.so.1 -> libnsl-2.11.1.so --rwxr-xr-x root/root lib/libnss_compat-2.11.1.so -lrwxrwxrwx root/root lib/libnss_compat.so.2 -> libnss_compat-2.11.1.so --rwxr-xr-x root/root lib/libnss_dns-2.11.1.so -lrwxrwxrwx root/root lib/libnss_dns.so.2 -> libnss_dns-2.11.1.so --rwxr-xr-x root/root lib/libnss_files-2.11.1.so -lrwxrwxrwx root/root lib/libnss_files.so.2 -> libnss_files-2.11.1.so --rwxr-xr-x root/root lib/libnss_hesiod-2.11.1.so -lrwxrwxrwx root/root lib/libnss_hesiod.so.2 -> libnss_hesiod-2.11.1.so --rwxr-xr-x root/root lib/libnss_nis-2.11.1.so -lrwxrwxrwx root/root lib/libnss_nis.so.2 -> libnss_nis-2.11.1.so --rwxr-xr-x root/root lib/libnss_nisplus-2.11.1.so -lrwxrwxrwx root/root lib/libnss_nisplus.so.2 -> libnss_nisplus-2.11.1.so +-rwxr-xr-x root/root lib/libnsl-2.11.2.so +lrwxrwxrwx root/root lib/libnsl.so.1 -> libnsl-2.11.2.so +-rwxr-xr-x root/root lib/libnss_compat-2.11.2.so +lrwxrwxrwx root/root lib/libnss_compat.so.2 -> libnss_compat-2.11.2.so +-rwxr-xr-x root/root lib/libnss_dns-2.11.2.so +lrwxrwxrwx root/root lib/libnss_dns.so.2 -> libnss_dns-2.11.2.so +-rwxr-xr-x root/root lib/libnss_files-2.11.2.so +lrwxrwxrwx root/root lib/libnss_files.so.2 -> libnss_files-2.11.2.so +-rwxr-xr-x root/root lib/libnss_hesiod-2.11.2.so +lrwxrwxrwx root/root lib/libnss_hesiod.so.2 -> libnss_hesiod-2.11.2.so +-rwxr-xr-x root/root lib/libnss_nis-2.11.2.so +lrwxrwxrwx root/root lib/libnss_nis.so.2 -> libnss_nis-2.11.2.so +-rwxr-xr-x root/root lib/libnss_nisplus-2.11.2.so +lrwxrwxrwx root/root lib/libnss_nisplus.so.2 -> libnss_nisplus-2.11.2.so -rwxr-xr-x root/root lib/libpcprofile.so --rwxr-xr-x root/root lib/libpthread-2.11.1.so -lrwxrwxrwx root/root lib/libpthread.so.0 -> libpthread-2.11.1.so --rwxr-xr-x root/root lib/libresolv-2.11.1.so -lrwxrwxrwx root/root lib/libresolv.so.2 -> libresolv-2.11.1.so --rwxr-xr-x root/root lib/librt-2.11.1.so -lrwxrwxrwx root/root lib/librt.so.1 -> librt-2.11.1.so +-rwxr-xr-x root/root lib/libpthread-2.11.2.so +lrwxrwxrwx root/root lib/libpthread.so.0 -> libpthread-2.11.2.so +-rwxr-xr-x root/root lib/libresolv-2.11.2.so +lrwxrwxrwx root/root lib/libresolv.so.2 -> libresolv-2.11.2.so +-rwxr-xr-x root/root lib/librt-2.11.2.so +lrwxrwxrwx root/root lib/librt.so.1 -> librt-2.11.2.so -rwxr-xr-x root/root lib/libthread_db-1.0.so lrwxrwxrwx root/root lib/libthread_db.so.1 -> libthread_db-1.0.so --rwxr-xr-x root/root lib/libutil-2.11.1.so -lrwxrwxrwx root/root lib/libutil.so.1 -> libutil-2.11.1.so +-rwxr-xr-x root/root lib/libutil-2.11.2.so +lrwxrwxrwx root/root lib/libutil.so.1 -> libutil-2.11.2.so drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/ldconfig -rwxr-xr-x root/root sbin/sln @@ -137,6 +137,7 @@ drwxr-xr-x root/root usr/include/asm/ -rw-r--r-- root/root usr/include/asm/errno.h -rw-r--r-- root/root usr/include/asm/fcntl.h -rw-r--r-- root/root usr/include/asm/hw_breakpoint.h +-rw-r--r-- root/root usr/include/asm/hyperv.h -rw-r--r-- root/root usr/include/asm/ioctl.h -rw-r--r-- root/root usr/include/asm/ioctls.h -rw-r--r-- root/root usr/include/asm/ipcbuf.h @@ -395,6 +396,7 @@ drwxr-xr-x root/root usr/include/linux/can/ -rw-r--r-- root/root usr/include/linux/can/raw.h -rw-r--r-- root/root usr/include/linux/capability.h -rw-r--r-- root/root usr/include/linux/capi.h +-rw-r--r-- root/root usr/include/linux/cciss_defs.h -rw-r--r-- root/root usr/include/linux/cciss_ioctl.h -rw-r--r-- root/root usr/include/linux/cdk.h -rw-r--r-- root/root usr/include/linux/cdrom.h @@ -605,6 +607,7 @@ drwxr-xr-x root/root usr/include/linux/netfilter/ -rw-r--r-- root/root usr/include/linux/netfilter/xt_CLASSIFY.h -rw-r--r-- root/root usr/include/linux/netfilter/xt_CONNMARK.h -rw-r--r-- root/root usr/include/linux/netfilter/xt_CONNSECMARK.h +-rw-r--r-- root/root usr/include/linux/netfilter/xt_CT.h -rw-r--r-- root/root usr/include/linux/netfilter/xt_DSCP.h -rw-r--r-- root/root usr/include/linux/netfilter/xt_LED.h -rw-r--r-- root/root usr/include/linux/netfilter/xt_MARK.h @@ -732,6 +735,7 @@ drwxr-xr-x root/root usr/include/linux/nfsd/ -rw-r--r-- root/root usr/include/linux/nl80211.h -rw-r--r-- root/root usr/include/linux/nubus.h -rw-r--r-- root/root usr/include/linux/nvram.h +-rw-r--r-- root/root usr/include/linux/omapfb.h -rw-r--r-- root/root usr/include/linux/oom.h -rw-r--r-- root/root usr/include/linux/param.h -rw-r--r-- root/root usr/include/linux/parport.h @@ -864,12 +868,12 @@ drwxr-xr-x root/root usr/include/linux/usb/ -rw-r--r-- root/root usr/include/linux/usb/gadgetfs.h -rw-r--r-- root/root usr/include/linux/usb/midi.h -rw-r--r-- root/root usr/include/linux/usb/tmc.h --rw-r--r-- root/root usr/include/linux/usb/vstusb.h -rw-r--r-- root/root usr/include/linux/usbdevice_fs.h -rw-r--r-- root/root usr/include/linux/utime.h -rw-r--r-- root/root usr/include/linux/utsname.h -rw-r--r-- root/root usr/include/linux/version.h -rw-r--r-- root/root usr/include/linux/veth.h +-rw-r--r-- root/root usr/include/linux/vhost.h -rw-r--r-- root/root usr/include/linux/videodev.h -rw-r--r-- root/root usr/include/linux/videodev2.h -rw-r--r-- root/root usr/include/linux/videotext.h diff --git a/base/glibc/.md5sum b/base/glibc/.md5sum index ef64dc7da..d7f985956 100644 --- a/base/glibc/.md5sum +++ b/base/glibc/.md5sum @@ -1,6 +1,7 @@ 3887f95991887096a4de8760541bf7fe SUPPORTED fe5f1e6bec88c71f28b1196961b89789 gcc-4.5.0-glibc-01.patch -6856d5d8b1239556687f0d1217f3f266 glibc-2.11.1.tar.bz2 +d1f28cb98acb9417fe52596908bbb9fd glibc-2.11.2-gcc_fix-1.patch +414fc1bad64c0e34ead0bb3d0f191456 glibc-2.11.2.tar.bz2 337046ceada10c767b1677d8393e1f8c ld.so.conf -80c5ff544b0ee4d9b5d8b8b89d4a0ef9 linux-2.6.33.2.tar.bz2 +10eebcb0178fb4540e2165bfd7efc7ad linux-2.6.34.tar.bz2 dc28b61b16df5707770e4f936bf6fa31 nsswitch.conf diff --git a/base/glibc/Pkgfile b/base/glibc/Pkgfile index 0b1397f2f..906a0fc56 100755 --- a/base/glibc/Pkgfile +++ b/base/glibc/Pkgfile @@ -4,11 +4,12 @@ # Packager:thierryn1 at hispeed dot ch name=glibc -version=2.11.1 +version=2.11.2 release=1 -kernelversion=2.6.33.2 +kernelversion=2.6.34 source=( http://ftp.gnu.org/gnu/glibc/$name-$version.tar.bz2 \ - gcc-4.5.0-glibc-01.patch \ + gcc-4.5.0-glibc-01.patch + http://www.linuxfromscratch.org/patches/lfs/development/glibc-2.11.2-gcc_fix-1.patch \ http://www.kernel.org/pub/linux/kernel/v2.6/linux-${kernelversion}.tar.bz2 nsswitch.conf ld.so.conf SUPPORTED) @@ -24,20 +25,20 @@ build() { cd .. # install glibc cd $name-$version - patch -Np1 -i ../gcc-4.5.0-glibc-01.patch + # patch -Np1 -i ../gcc-4.5.0-glibc-01.patch DL=$(readelf -l /bin/sh | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p') sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|" \ scripts/test-installation.pl unset DL sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in +patch -Np1 -i ../glibc-2.11.2-gcc_fix-1.patch +# sed -i s/utf8/UTF-8/ libio/tst-fgetwc.c +# sed -i '/tst-fgetws-ENV/ a\ +# tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata' libio/Makefile -sed -i s/utf8/UTF-8/ libio/tst-fgetwc.c -sed -i '/tst-fgetws-ENV/ a\ -tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata' libio/Makefile - -sed -i -e 's/FUTEX_WAIT\( | FUTEX_CLOCK_REALTIME, reg\)/FUTEX_WAIT_BITSET\1/' \ - nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +# sed -i -e 's/FUTEX_WAIT\( | FUTEX_CLOCK_REALTIME, reg\)/FUTEX_WAIT_BITSET\1/' \ +# nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S mv ../SUPPORTED localedata/ |