Date: Friday, May 16, 2014 @ 22:53:14 Author: heftig Revision: 111333
2.19-5 Added: lib32-glibc/trunk/glibc-2.19-tzselect-default.patch Modified: lib32-glibc/trunk/PKGBUILD -----------------------------------+ PKGBUILD | 27 ++++++++++++++++++--------- glibc-2.19-tzselect-default.patch | 13 +++++++++++++ 2 files changed, 31 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-05-16 17:15:47 UTC (rev 111332) +++ PKGBUILD 2014-05-16 20:53:14 UTC (rev 111333) @@ -9,26 +9,32 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.19 -pkgrel=4 -pkgdesc="GNU C Library for multilib" +pkgrel=5 +pkgdesc="GNU C Library (32-bit)" arch=('x86_64') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') -makedepends=('gcc-multilib>=4.7') +groups=() +depends=() +makedepends=('gcc-multilib>=4.8') +backup=() options=('!strip' '!emptydirs' 'staticlibs') +install= source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig} glibc-2.19-xattr_header.patch glibc-2.19-fix-sign-in-bsloww1-input.patch + glibc-2.19-tzselect-default.patch lib32-glibc.conf) md5sums=('e26b8cc666b162f999404b03970f14e4' 'SKIP' '39a4876837789e07746f1d84cd8cb46a' '755a1a9d7844a5e338eddaa9a5d974cd' + 'c772dc99ddd8032ecbf43884ae0cf42e' '6e052f1cb693d5d3203f50f9d4e8c33b') prepare() { cd ${srcdir}/${_pkgbasename}-${pkgver} - + # fix for {linux,sys}/xattr.h incompatibility - commit fdbe8eae patch -p1 -i $srcdir/glibc-2.19-xattr_header.patch @@ -35,6 +41,9 @@ # fix issues in sin/cos slow path calculation - commit ffe768a9 patch -p1 -i $srcdir/glibc-2.19-fix-sign-in-bsloww1-input.patch + # fix tzselect with missing TZDIR - commit 893b4f37/c72399fb + patch -p1 -i $srcdir/glibc-2.19-tzselect-default.patch + mkdir ${srcdir}/glibc-build } @@ -55,7 +64,7 @@ export CXX="g++ -m32" # remove hardening options for building libraries - CFLAGS=${CFLAGS/-fstack-protector/} + CFLAGS=${CFLAGS/-fstack-protector-strong/} CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/} ${srcdir}/${_pkgbasename}-${pkgver}/configure --prefix=/usr \ @@ -76,8 +85,8 @@ # re-enable hardening for programs sed -i "/build-programs=/s#no#yes#" configparms - echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms - echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + echo "CC += -fstack-protector-strong -D_FORTIFY_SOURCE=2" >> configparms + echo "CXX += -fstack-protector-strong -D_FORTIFY_SOURCE=2" >> configparms make # remove harding in preparation to run test-suite @@ -90,8 +99,8 @@ cd ${srcdir}/glibc-build - # only acceptable testsuite error is some small libm ulp failures on i686 with gcc-4.9 - # TODO: fix upstream and provide patch + # ULP failures on i686 are all small and can be ignored + # tst-cleanupx4.out failure on i686 needs investigating... make -k check || true } Added: glibc-2.19-tzselect-default.patch =================================================================== --- glibc-2.19-tzselect-default.patch (rev 0) +++ glibc-2.19-tzselect-default.patch 2014-05-16 20:53:14 UTC (rev 111333) @@ -0,0 +1,13 @@ +diff --git a/timezone/Makefile b/timezone/Makefile +index 998cd14..d5f647c 100644 +--- a/timezone/Makefile ++++ b/timezone/Makefile +@@ -118,7 +118,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps) + + $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make + sed -e 's|/bin/bash|$(KSH)|g' \ +- -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \ ++ -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ + -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ + -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ + -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \