[arch-commits] Commit in glibc/trunk (PKGBUILD locale-gen)
Allan McRae
allan at nymeria.archlinux.org
Mon Oct 21 12:47:17 UTC 2013
Date: Monday, October 21, 2013 @ 14:47:16
Author: allan
Revision: 197010
upgpkg: glibc 2.18-7
fix locale-gen, keep some more static libraries
Modified:
glibc/trunk/PKGBUILD
glibc/trunk/locale-gen
------------+
PKGBUILD | 7 ++++---
locale-gen | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-10-21 12:41:49 UTC (rev 197009)
+++ PKGBUILD 2013-10-21 12:47:16 UTC (rev 197010)
@@ -8,7 +8,7 @@
pkgname=glibc
pkgver=2.18
-pkgrel=6
+pkgrel=7
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/libc"
@@ -43,7 +43,7 @@
'd5fab2cd3abea65aa5ae696ea4a47d6b'
'da662ca76e7c8d7efbc7986ab7acea2d'
'07ac979b6ab5eeb778d55f041529d623'
- '3d46e93c8d2771a22502d5a9603e5c49')
+ 'b5fd017036fb91199ee76f670da8c15b')
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -149,7 +149,8 @@
# remove the static libraries that have a shared counterpart
cd $pkgdir/usr/lib
- rm lib{anl,BrokenLocale,c,crypt,dl,m,nsl,pthread,resolv,rt,util}.a
+ # note: keep libc, libdl, libm for binutils testsuite
+ rm lib{anl,BrokenLocale,crypt,nsl,pthread,resolv,rt,util}.a
# Do not strip the following files for improved debugging support
# ("improved" as in not breaking gdb and valgrind...):
Modified: locale-gen
===================================================================
--- locale-gen 2013-10-21 12:41:49 UTC (rev 197009)
+++ locale-gen 2013-10-21 12:47:16 UTC (rev 197010)
@@ -35,7 +35,7 @@
localedef -i "$input" -c -f "$charset" -A /usr/share/locale/locale.alias "$locale"
}
-maxjobs=$(grep -qc processor /proc/cpuinfo 2>/dev/null || echo 1)
+maxjobs=$(grep -c processor /proc/cpuinfo 2>/dev/null || echo 1)
echo "Generating locales..."
while read locale charset; do \
case $locale in
More information about the arch-commits
mailing list