summaryrefslogtreecommitdiff
path: root/core/glibc
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2011-10-08 09:37:01 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2011-10-08 09:37:01 +0200
commit8b8c8dcde00a0468772251f56a89bb0fcef7f5ba (patch)
treeba60117aa35e0f0dfb5959f017b87cb60c29c525 /core/glibc
parent492af20f1811aad663d0536eef5d3f1dd4e39a76 (diff)
Make glibc's ports tarball, update to 2.14-6.
Diffstat (limited to 'core/glibc')
-rw-r--r--core/glibc/PKGBUILD20
1 files changed, 17 insertions, 3 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 754d04d4a..d8d5c2881 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -7,8 +7,6 @@
pkgname=glibc
pkgver=2.14
pkgrel=6
-pkgver=2.13 #holdver
-pkgrel=5.1 #holdver
_glibcdate=20110908
pkgdesc="GNU C Library"
arch=('i686' 'x86_64' 'mips64el')
@@ -23,6 +21,7 @@ backup=(etc/gai.conf
options=('!strip')
install=glibc.install
source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
+ http://repo.parabolagnulinux.org/other/glibc-ports-${pkgver}_${_glibcdate}.tar.xz
glibc-2.10-dont-build-timezone.patch
glibc-2.10-bz4781.patch
glibc-__i686.patch
@@ -38,6 +37,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t
locale.gen.txt
locale-gen)
md5sums=('069069eb9100cc7affd7ad884cb3c3e9'
+ '46569182a7ac0b94c0b1d643ab277dfa'
'4dadb9203b69a3210d53514bb46f41c3'
'0c5540efc51c0b93996c51b57a8540ae'
'40cd342e21f71f5e49e32622b25acc52'
@@ -60,6 +60,15 @@ mksource() {
git checkout -b glibc-2.14-arch origin/release/2.14/master
popd
tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
+ mksource-ports
+}
+
+mksource-ports() {
+ git clone git://sourceware.org/git/glibc-ports.git
+ pushd glibc-ports
+ git checkout -b glibc-2.14-arch origin/release/2.14/master
+ popd
+ tar -cvJf glibc-ports-${pkgver}_${_glibcdate}.tar.xz glibc-ports/*
}
build() {
@@ -104,6 +113,8 @@ build() {
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
+ ln -s ../glibc-ports ports
+
install -dm755 ${pkgdir}/etc
touch ${pkgdir}/etc/ld.so.conf
@@ -114,6 +125,9 @@ build() {
if [[ ${CARCH} = "i686" ]]; then
# Hack to fix NPTL issues with Xen, only required on 32bit platforms
export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
+ elif [[ ${CARCH} = "mips64el" ]]; then
+ # mips64el is only supported out of tree.
+ extra_addons=",ports"
fi
echo "slibdir=/lib" >> configparms
@@ -125,7 +139,7 @@ build() {
${srcdir}/glibc/configure --prefix=/usr \
--libdir=/usr/lib --libexecdir=/usr/lib \
--with-headers=/usr/include \
- --enable-add-ons=nptl,libidn \
+ --enable-add-ons=nptl,libidn$extra_addons \
--enable-kernel=2.6.27 \
--with-tls --with-__thread \
--enable-bind-now --without-gd \