summaryrefslogtreecommitdiffstats
path: root/glibc/Pkgfile
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2012-05-19 14:23:49 +0000
committerpiernov <piernov@piernov.org>2012-05-19 14:23:49 +0000
commitaf9ac162efa6bc30958495633d83048105c437e2 (patch)
treeee680baf32e21b82d617a8b36e2ea20abcc1485b /glibc/Pkgfile
parent53789d23917aea995f5060a18a0ee8db32f6826d (diff)
parent559d7d6b9fdf67d968f5d1c66a2f3f1b1d248109 (diff)
downloadnutyx-pakxe-af9ac162efa6bc30958495633d83048105c437e2.tar.gz
nutyx-pakxe-af9ac162efa6bc30958495633d83048105c437e2.tar.bz2
nutyx-pakxe-af9ac162efa6bc30958495633d83048105c437e2.tar.xz
nutyx-pakxe-af9ac162efa6bc30958495633d83048105c437e2.zip
Merge branch 'master' of ssh://piernov.org/srv/git/nutyx-pakxe
Diffstat (limited to 'glibc/Pkgfile')
-rwxr-xr-xglibc/Pkgfile46
1 files changed, 33 insertions, 13 deletions
diff --git a/glibc/Pkgfile b/glibc/Pkgfile
index f09db7201..38fd9e0d2 100755
--- a/glibc/Pkgfile
+++ b/glibc/Pkgfile
@@ -1,12 +1,21 @@
# Description: La librairie C utilisée dans le système GNU
# URL: http://www.gnu.org/software/libc/
-# Maintainer: NuTyX core team
+# Maintainer: Primarily Roland McGrath, roland at gnu dot org and many contributors, glibc-sc at gnu dot org
# Packager:thierryn1 at hispeed dot ch
name=glibc
-version=2.14.1
+version=2.15
release=1
-kernelversion=3.2.9
+kernelversion=3.3
+
+source=( http://ftp.gnu.org/gnu/glibc/$name-$version.tar.xz \
+ http://www.kernel.org/pub/linux/kernel/v3.3/linux-${kernelversion}.tar.xz \
+ http://nutyx.meticul.eu/files/patchs/$name/{nsswitch.conf,ld.so.conf,SUPPORTED} \
+ http://nutyx.meticul.eu/files/patchs/$name/glibc-2.14-reexport-rpc-interface.patch \
+ http://nutyx.meticul.eu/files/patchs/$name/glibc-2.14-reinstall-nis-rpc-headers.patch \
+ http://www.linuxfromscratch.org/patches/lfs/development/glibc-2.14.1-fixes-1.patch \
+ http://www.linuxfromscratch.org/patches/lfs/development/glibc-2.14.1-sort-1.patch \
+ http://www.linuxfromscratch.org/patches/lfs/development/glibc-2.14.1-gcc_fix-1.patch)
source=(http://ftp.gnu.org/gnu/glibc/$name-$version.tar.xz
http://nutyx.meticul.eu/files/patchs/$name/{nsswitch.conf,ld.so.conf,SUPPORTED}
@@ -28,17 +37,28 @@ build() {
make headers_check
make INSTALL_HDR_PATH=$PKG/usr headers_install
cd ..
+
# install glibc
cd $name-$version
- patch -Np1 -i ../glibc-$version-gcc_fix-1.patch
- patch -Np1 -i ../glibc-$version-fixes-1.patch
- patch -Np1 -i ../glibc-$version-sort-1.patch
- patch -Np1 -i ../glibc-$version-cpuid-1.patch
- patch -Np1 -i $SRC/glibc-2.12.1-static-shared-getpagesize.patch
sed -i '195,213 s/PRIVATE_FUTEX/FUTEX_CLOCK_REALTIME/' \
nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timed{rd,wr}lock.S
sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in
+
+ patch -Np1 -i ../glibc-2.14.1-fixes-1.patch
+ patch -Np1 -i ../glibc-2.14.1-sort-1.patch
+ patch -Np1 -i ../glibc-2.14.1-gcc_fix-1.patch
+
+ # libtirpc need it
+ # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (fedora branch)
+ patch -p1 -i ../glibc-2.14-reexport-rpc-interface.patch
+ # rpcbind need it
+ # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (fedora branch)
+ patch -p1 -i ../glibc-2.14-reinstall-nis-rpc-headers.patch
+
+ sed -i '195,213 s/PRIVATE_FUTEX/FUTEX_CLOCK_REALTIME/' \
+nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timed{rd,wr}lock.S
+
mv ../SUPPORTED localedata/
mkdir -v ../glibc-build
@@ -51,11 +71,11 @@ build() {
../$name-$version/configure --prefix=/usr \
--with-headers=$PKG/usr/include \
--disable-profile \
- --enable-add-ons \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --enable-kernel=2.6.18 \
- --libexecdir=/usr/lib/glibc
+ --enable-add-ons \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --enable-kernel=2.6.25 \
+ --libexecdir=/usr/lib/glibc
make
make install_root=$PKG install
make install_root=$PKG localedata/install-locales