diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 90651edbc..cfc3fc9c6 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -16,7 +16,7 @@ noautobuild=1 pkgname=glibc pkgver=2.19 -pkgrel=4 +pkgrel=5 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -32,6 +32,7 @@ install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${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 local-soname-hack.diff locale.gen.txt locale-gen) @@ -39,6 +40,7 @@ md5sums=('e26b8cc666b162f999404b03970f14e4' 'SKIP' '39a4876837789e07746f1d84cd8cb46a' '755a1a9d7844a5e338eddaa9a5d974cd' + 'c772dc99ddd8032ecbf43884ae0cf42e' '905370139382428ef2b97b247c0970bf' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -52,6 +54,9 @@ prepare() { # 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 + # ALARM: patch for hard-float ld-linux soname if [[ $CARCH == "armv6h" || $CARCH == "armv7h" ]]; then patch -p1 -i ${srcdir}/local-soname-hack.diff diff --git a/core/glibc/glibc-2.19-tzselect-default.patch b/core/glibc/glibc-2.19-tzselect-default.patch new file mode 100644 index 000000000..ccafb0b60 --- /dev/null +++ b/core/glibc/glibc-2.19-tzselect-default.patch @@ -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)"|' \