diff options
Diffstat (limited to 'glibc/Pkgfile')
| -rwxr-xr-x | glibc/Pkgfile | 75 |
1 files changed, 34 insertions, 41 deletions
diff --git a/glibc/Pkgfile b/glibc/Pkgfile index 38fd9e0d2..5b280aa36 100755 --- a/glibc/Pkgfile +++ b/glibc/Pkgfile @@ -6,48 +6,42 @@ name=glibc version=2.15 release=1 -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) +kernelversion=3.4.0 +kernelbaseversion=$(expr $kernelversion : '\([0-9]\.[0-9]\)') source=(http://ftp.gnu.org/gnu/glibc/$name-$version.tar.xz - http://nutyx.meticul.eu/files/patchs/$name/{nsswitch.conf,ld.so.conf,SUPPORTED} - http://www.linuxfromscratch.org/patches/lfs/development/glibc-$version-gcc_fix-1.patch - http://www.linuxfromscratch.org/patches/lfs/development/glibc-$version-fixes-1.patch - http://www.linuxfromscratch.org/patches/lfs/development/glibc-$version-sort-1.patch - http://www.linuxfromscratch.org/patches/lfs/development/glibc-$version-cpuid-1.patch - http://nutyx.meticul.eu/files/patchs/$name/glibc-2.12.1-static-shared-getpagesize.patch - http://www.kernel.org/pub/linux/kernel/v3.0/linux-${kernelversion%.*}.tar.bz2 - http://www.kernel.org/pub/linux/kernel/v3.0/patch-$kernelversion.bz2) + http://www.kernel.org/pub/linux/kernel/v3.0/linux-$kernelbaseversion.tar.xz + http://www.linuxfromscratch.org/patches/lfs/development/glibc-2.15-fixes-1.patch + http://www.linuxfromscratch.org/patches/lfs/development/glibc-2.15-gcc_fix-1.patch + 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://nutyx.meticul.eu/files/patchs/$name/{nsswitch.conf,SUPPORTED} + ld.so.conf) + +if [ "${kernelversion}" != "${kernelbaseversion}.0" ]; then +source[${#source[*]}]="http://www.kernel.org/pub/linux/kernel/v3.0/patch-$version.xz" +fi build() { - # install build kernel headers - mkdir $PKG/usr/ - cd linux-${kernelversion%.*} - bzip2 -d -c $SRC/patch-$kernelversion.bz2 | patch -Np1 - sed -i '/scsi/d' include/Kbuild - make mrproper - make headers_check - make INSTALL_HDR_PATH=$PKG/usr headers_install - cd .. + # install build kernel headers + mkdir $PKG/usr/ + cd linux-$kernelbaseversion + if [ -f $SRC/patch-$version.xz ]; then + xzcat $SRC/patch-$version.xz | patch -Np1 + fi + + make mrproper + make headers_check + make INSTALL_HDR_PATH=$PKG/usr headers_install + cd .. - # install glibc - cd $name-$version + # install glibc + cd $name-$version - 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 + patch -Np1 -i ../glibc-2.15-fixes-1.patch + patch -Np1 -i ../glibc-2.15-gcc_fix-1.patch # libtirpc need it # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (fedora branch) @@ -56,8 +50,7 @@ build() { # 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 + 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/ @@ -68,14 +61,14 @@ nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timed{rd,wr}lock.S i?86) echo "CFLAGS += -march=i486 -mtune=native -O3 -pipe" > configparms ;; esac - ../$name-$version/configure --prefix=/usr \ + ../$name-$version/configure --prefix=/usr \ --with-headers=$PKG/usr/include \ --disable-profile \ - --enable-add-ons \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ + --enable-add-ons \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ --enable-kernel=2.6.25 \ - --libexecdir=/usr/lib/glibc + --libexecdir=/usr/lib/glibc make make install_root=$PKG install make install_root=$PKG localedata/install-locales |