[arch-commits] Commit in glibc/trunk (PKGBUILD glibc.install)
Allan McRae
allan at archlinux.org
Sat May 22 07:58:24 UTC 2010
Date: Saturday, May 22, 2010 @ 03:58:24
Author: allan
Revision: 80781
upgpkg: glibc 2.12-1
glibc-2.12 toolchain build, upstream update, clean up old install stuff
Modified:
glibc/trunk/PKGBUILD
glibc/trunk/glibc.install
---------------+
PKGBUILD | 26 +++++-------
glibc.install | 118 +-------------------------------------------------------
2 files changed, 16 insertions(+), 128 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-05-22 07:56:47 UTC (rev 80780)
+++ PKGBUILD 2010-05-22 07:58:24 UTC (rev 80781)
@@ -6,15 +6,15 @@
# NOTE: valgrind requires rebuilt with each new glibc version
pkgname=glibc
-pkgver=2.11.1
-pkgrel=3
-_glibcdate=20100318
+pkgver=2.12
+pkgrel=1
+_glibcdate=20100521
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/libc"
license=('GPL' 'LGPL')
groups=('base')
-depends=('linux-api-headers>=2.6.33' 'tzdata')
+depends=('linux-api-headers>=2.6.34' 'tzdata')
makedepends=('gcc>=4.4')
replaces=('glibc-xen')
backup=(etc/locale.gen
@@ -27,7 +27,7 @@
nscd
locale.gen.txt
locale-gen)
-md5sums=('4b7f8ed5a0ea946bd40318855449b570'
+md5sums=('5c0e450103c1e2d008c34ac208910b99'
'4dadb9203b69a3210d53514bb46f41c3'
'0c5540efc51c0b93996c51b57a8540ae'
'40cd342e21f71f5e49e32622b25acc52'
@@ -36,11 +36,9 @@
'476e9113489f93b348b21e144b6a8fcf')
mksource() {
- mkdir glibc-${pkgver}_${_glibcdate}
- cd glibc-${pkgver}_${_glibcdate}
git clone git://sourceware.org/git/glibc.git
pushd glibc
- git checkout -b glibc-2.11-arch origin/release/2.11/master
+ git checkout -b glibc-2.12-arch origin/release/2.12/master
popd
tar -cvjf glibc-${pkgver}_${_glibcdate}.tar.bz2 glibc/*
}
@@ -49,14 +47,14 @@
cd ${srcdir}/glibc
# timezone data is in separate package (tzdata)
- patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch || return 1
+ patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
# http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
- patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch || return 1
+ patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
# http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
# http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
- patch -Np1 -i ${srcdir}/glibc-__i686.patch || return 1
+ patch -Np1 -i ${srcdir}/glibc-__i686.patch
install -dm755 ${pkgdir}/etc
touch ${pkgdir}/etc/ld.so.conf
@@ -83,12 +81,12 @@
package() {
cd ${srcdir}/glibc/glibc-build
- make install_root=${pkgdir} install || return 1
+ make install_root=${pkgdir} install
# provided by kernel-headers
rm ${pkgdir}/usr/include/scsi/scsi.h
- rm ${pkgdir}/etc/ld.so.cache ${pkgdir}/etc/ld.so.conf
+ rm ${pkgdir}/etc/ld.so.conf
install -dm755 ${pkgdir}/etc/rc.d
install -dm755 ${pkgdir}/usr/sbin
@@ -97,7 +95,7 @@
install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd
install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
- sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf || return 1
+ sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
# create /etc/locale.gen
install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
Modified: glibc.install
===================================================================
--- glibc.install 2010-05-22 07:56:47 UTC (rev 80780)
+++ glibc.install 2010-05-22 07:58:24 UTC (rev 80781)
@@ -2,125 +2,15 @@
filelist=(libc.info libc.info-1 libc.info-2 libc.info-3 libc.info-4 libc.info-5 libc.info-6 libc.info-7
libc.info-8 libc.info-9 libc.info-10 libc.info-11)
-pre_upgrade() {
-if [ "`uname -m`" = "x86_64" ]; then
- if [ "`vercmp $2 2.4`" -lt 0 ]; then
- cat << _EOF
- ==> glibc oldpkgver < 2.4 detected!
- ==>
- ==> ATTENTION x86_64 USERS:
- ==>
- ==> We now switch from the former lib-linking to pure /lib support. To get rid
- ==> of all lib64 directories we have removed the link /lib -> /lib64 and
- ==> /usr/lib -> /usr/lib64.
- ==>
- ==> We have also rebuilt all packages we know that still used lib64 directories.
- ==> Now all should go to /lib directories.
- ==>
- ==> Internally we have removed the link and then mv /lib64 /lib. Same to /usr/lib64.
- ==> /lib64 and /usr/lib64 shouldn't exist anymore. If any package still installs to
- ==> /lib64 or /usr/lib64 let us know.
- ==>
-_EOF
-
-# now the moving
-rm -rf /lib/tls && echo "/lib/tls removed"
-ldconfig -r .
-rm -f /usr/lib
-mv /usr/lib64 /usr/lib && echo "/usr/lib64 moved"
-rm -f /lib
-mv /lib64 /lib && echo "/lib64 moved"
-
- fi
-fi
-}
-
post_upgrade() {
ldconfig -r .
[ -x /sbin/init ] && init u
-
- if [ "`vercmp $2 2.3.6`" -lt 0 ]; then
- cat << _EOF
- ==> ATTENTION INTERNATIONAL USERS:
- ==>
- ==> Locales are no longer included in the glibc package.
- ==> They are generated by /usr/sbin/locale-gen depending on the contents
- ==> of /etc/locale.gen.
- ==> glibc will try to autodetect the required locales now, if you need
- ==> additional locales, please enable them in /etc/locale.gen and run
- ==> /usr/sbin/locale-gen
- ==>
-_EOF
- # Check active locales, enable the ones that are in use
- loc=("$LANG"
- "`grep '^LOCALE=' etc/rc.conf | awk -F '=' '{ print $2 }'`")
- for l in "${loc[@]}"; do
- if [ ! -z "${l}" ]; then
- line="`grep -i "^#${l}[[:space:]]" etc/locale.gen`"
- if [ ! -z "${line}" ]; then
- sed -i -e "s|${line}|${line/\#/}|" etc/locale.gen
- fi
- fi
- done
- fi
-
usr/sbin/locale-gen
-
-# fix CHOST for arch64
-if [ "`uname -m`" = "x86_64" ]; then
- if [ "`vercmp $2 2.4`" -lt 0 ]; then
- sed -i s/'x86_64-pc-linux-gnu'/'x86_64-unknown-linux-gnu'/ /etc/makepkg.conf && \
- echo "in /etc/makepkg.conf CHOST has been changed to \"x86_64-unknown-linux-gnu\""
-
- # we remove files from glibc 2.3.6 that are not removed automatically
- rm -f /lib/ld-2.3.* && echo "removing unneeded old files"
- rm -f /lib/libBrokenLocale-2.3.*
- rm -f /lib/libNoVersion*
- rm -f /lib/libanl-2.3.*
- rm -f /lib/libc-2.3.*
- rm -f /lib/libcidn-2.3.*
- rm -f /lib/libcrypt-2.3.*
- rm -f /lib/libdl-2.3.*
- rm -f /lib/libm-2.3.*
- rm -f /lib/libnsl-2.3.*
- rm -f /lib/libnss1*
- rm -f /lib/libnss_compat-2.3.*
- rm -f /lib/libnss_dns-2.3.*
- rm -f /lib/libnss_dns.so.1
- rm -f /lib/libnss_files-2.3.*
- rm -f /lib/libnss_files.so.1
- rm -f /lib/libnss_hesiod-2.3.*
- rm -f /lib/libnss_nis-2.3.*
- rm -f /lib/libnss_nis.so.1
- rm -f /lib/libnss_nisplus-2.3.*
- rm -f /lib/libpthread-0.10.so
- rm -f /lib/libresolv-2.3.*
- rm -f /lib/librt-2.3.*
- rm -f /lib/libutil-2.3.*
- rm -fR /lib/nosegneg
- #rm -fR /usr/include/asm
- #rm -fR /usr/include/linux
- rm -fR /usr/include/ntpl
- rm -f /usr/lib/libNoVersion*
- rm -f /usr/lib/libc_stubs.a
- rm -f /usr/lib/libnss1*
- rm -f /usr/lib/libnss_compat.so.1
- rm -f /usr/lib/libnss_dns.so.1
- rm -f /usr/lib/libnss_files.so.1
- rm -f /usr/lib/libnss_nis.so.1
- rm -fR /usr/lib/nptl
- rm -f /usr/sbin/nscd_nischeck
- rm -fR /usr/share/zoneinfo/SystemV
- rm -fR /usr/share/zoneinfo/posix/SystemV
- rm -fR /usr/share/zoneinfo/right/SystemV
- ldconfig -r .
- fi
-fi
-
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
+
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
+ done
}
pre_remove() {
More information about the arch-commits
mailing list