From e84fa26ea9c8ec88aff5d87fea6bb9dc69dc26b4 Mon Sep 17 00:00:00 2001 From: abveritas Date: Wed, 20 Apr 2011 20:54:23 +0000 Subject: [PATCH 1/3] rebuild squashfs-tools for new glibc --- squashfs-tools/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squashfs-tools/PKGBUILD b/squashfs-tools/PKGBUILD index cb9656606..ab2d7f05d 100644 --- a/squashfs-tools/PKGBUILD +++ b/squashfs-tools/PKGBUILD @@ -7,7 +7,7 @@ pkgname=squashfs-tools pkgver=4.1 _gitcheckout=20101231 -pkgrel=2 +pkgrel=3 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux." url="http://squashfs.sourceforge.net" license=("GPL") From 89638b9e6f2119540397643c7668c7236e1dcd25 Mon Sep 17 00:00:00 2001 From: philm Date: Thu, 21 Apr 2011 22:27:41 +0200 Subject: [PATCH 2/3] glibc: use tarball from the release day --- gcc/PKGBUILD | 6 +++--- glibc/PKGBUILD | 31 +++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/gcc/PKGBUILD b/gcc/PKGBUILD index 5a03628b0..f318c4b36 100644 --- a/gcc/PKGBUILD +++ b/gcc/PKGBUILD @@ -18,7 +18,7 @@ pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils>=2.21' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'dejagnu' 'autogen') +makedepends=('binutils>=2.20.2' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'dejagnu' 'autogen') options=('!libtool' '!emptydirs' 'log') source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{ada,core,fortran,g++,objc,testsuite}-${pkgver}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{ada,core,fortran,g++,objc,testsuite}-${_snapshot}.tar.bz2 @@ -96,7 +96,7 @@ package_gcc-libs() { pkgdesc="Runtime libraries shipped by GCC for C and C++ languages" groups=('base') - depends=('glibc>=2.11.1-2') + depends=('glibc>=2.12.2') install=gcc-libs.install cd gcc-build @@ -123,7 +123,7 @@ package_gcc-libs() package_gcc() { - depends=('binutils>=2.20.1' 'libmpc>=0.8.1-1' 'cloog-ppl>=0.15.9-2' 'elfutils') + depends=('binutils>=2.20.2' 'libmpc>=0.9' 'cloog' 'ppl') groups=('base-devel') install=gcc.install diff --git a/glibc/PKGBUILD b/glibc/PKGBUILD index d9d1774f9..b0e036d1f 100644 --- a/glibc/PKGBUILD +++ b/glibc/PKGBUILD @@ -9,7 +9,7 @@ pkgname=glibc pkgver=2.13 -pkgrel=2 +pkgrel=3 _glibcdate=20110416 # dash the next line if you want to skip the tests _test=1 @@ -24,23 +24,26 @@ backup=(etc/locale.gen etc/nscd.conf) options=('!strip' 'log') install=glibc.install -source=(http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}_${_glibcdate}.tar.xz +source=(#http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}_${_glibcdate}.tar.xz + http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz glibc-2.10-dont-build-timezone.patch glibc-2.10-bz4781.patch glibc-__i686.patch glibc-2.12.1-static-shared-getpagesize.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch - glibc-2.13-nlist1failed.patch + glibc-2.13-prelink.patch + glibc-2.13-futex.patch nscd locale.gen.txt locale-gen) -md5sums=('36f3344815f0f9a0e105a3855453663c' +md5sums=('6a02f2114af044e5d63e1fd6e30ce87d' '4dadb9203b69a3210d53514bb46f41c3' '0c5540efc51c0b93996c51b57a8540ae' '40cd342e21f71f5e49e32622b25acc52' 'a3ac6f318d680347bb6e2805d42b73b2' 'b042647ea7d6f22ad319e12e796bd13e' - '295e04008f0c2417430b063776f43b84' + '24dfab6fd244f3773523412588ecc52c' + '7d0154b7e17ea218c9fa953599d24cc4' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -49,10 +52,14 @@ mksource() { rm -vRf glibc git clone git://sourceware.org/git/glibc.git pushd glibc - git checkout -b glibc-2.13-arch origin/release/2.13/master + #git checkout -b glibc-2.13-arch origin/release/2.13/master + git checkout -b glibc-2.13-arch glibc-2.13 + rm -vRf .git* popd - tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* - md5sum glibc-${pkgver}_${_glibcdate}.tar.xz + #tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* + #md5sum glibc-${pkgver}_${_glibcdate}.tar.xz + tar -cvJf glibc-${pkgver}.tar.xz glibc/* + md5sum glibc-${pkgver}.tar.xz } build() { @@ -76,8 +83,12 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch - # http://sourceware.org/bugzilla/show_bug.cgi?id=12454 - patch -Np1 -i ${srcdir}/glibc-2.13-nlist1failed.patch + # http://sourceware.org/bugzilla/show_bug.cgi?id=12489 + # http://sourceware.org/git/?p=glibc.git;a=commit;h=25b3aada (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch + + # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 + patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf From 7eab0f874751d2d3269f61f9de9ee8ccd8575ee9 Mon Sep 17 00:00:00 2001 From: philm Date: Thu, 21 Apr 2011 22:28:29 +0200 Subject: [PATCH 3/3] glibc: readd patches --- glibc/glibc-2.13-futex.patch | 31 +++++++++++++++++++++++++++++++ glibc/glibc-2.13-prelink.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 glibc/glibc-2.13-futex.patch create mode 100644 glibc/glibc-2.13-prelink.patch diff --git a/glibc/glibc-2.13-futex.patch b/glibc/glibc-2.13-futex.patch new file mode 100644 index 000000000..9b9c3ac45 --- /dev/null +++ b/glibc/glibc-2.13-futex.patch @@ -0,0 +1,31 @@ +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S +@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S +@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: + + 7: movq %rdx, %rax + +-#ifndef __ASSUME_PRIVATE_FUTEX ++#ifndef __ASSUME_FUTEX_CLOCK_REALTIME + addq $16, %rsp + cfi_adjust_cfa_offset(-16) + popq %r14 +@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) diff --git a/glibc/glibc-2.13-prelink.patch b/glibc/glibc-2.13-prelink.patch new file mode 100644 index 000000000..bef7998a8 --- /dev/null +++ b/glibc/glibc-2.13-prelink.patch @@ -0,0 +1,26 @@ +diff --git a/elf/rtld.c b/elf/rtld.c +index 9a560b3..201c9cf 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + we need it in the memory handling later. */ + GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist; + ++ /* Remember the last search directory added at startup, now that ++ malloc will no longer be the one from dl-minimal.c. */ ++ GLRO(dl_init_all_dirs) = GL(dl_all_dirs); ++ + if (prelinked) + { + if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL) +@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + lossage); + } + +- /* Remember the last search directory added at startup, now that +- malloc will no longer be the one from dl-minimal.c. */ +- GLRO(dl_init_all_dirs) = GL(dl_all_dirs); +- + if (! prelinked && rtld_multiple_ref) + { + /* There was an explicit ref to the dynamic linker as a shared lib.