diff options
| author | piernov <piernov@piernov.org> | 2012-03-04 07:37:21 +0000 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2012-03-04 07:37:21 +0000 |
| commit | 86c07725c7f474965e10ed2c60d1cbd454a65624 (patch) | |
| tree | ad1cd53643c06543823d3f83c668e175f03a04b3 /glibc | |
| parent | 5bcf27a1b726477ddf1167138ac389c629f83788 (diff) | |
| parent | b96171f6797c34a19feba65283ef0c286c321e28 (diff) | |
| download | nutyx-pakxe-86c07725c7f474965e10ed2c60d1cbd454a65624.tar.gz nutyx-pakxe-86c07725c7f474965e10ed2c60d1cbd454a65624.tar.bz2 nutyx-pakxe-86c07725c7f474965e10ed2c60d1cbd454a65624.tar.xz nutyx-pakxe-86c07725c7f474965e10ed2c60d1cbd454a65624.zip | |
gcc 4.6.3-1 màj port + Merge git://piernov.org/nutyx-pakxe
Diffstat (limited to 'glibc')
| -rw-r--r-- | glibc/.md5sum.i686 | 1 | ||||
| -rw-r--r-- | glibc/.md5sum.x86_64 | 1 | ||||
| -rwxr-xr-x | glibc/Pkgfile | 27 | ||||
| -rw-r--r-- | glibc/post-install | 1 |
4 files changed, 15 insertions, 15 deletions
diff --git a/glibc/.md5sum.i686 b/glibc/.md5sum.i686 index 956a2931a..f67352a4d 100644 --- a/glibc/.md5sum.i686 +++ b/glibc/.md5sum.i686 @@ -1,5 +1,6 @@ 3887f95991887096a4de8760541bf7fe SUPPORTED a3ac6f318d680347bb6e2805d42b73b2 glibc-2.12.1-static-shared-getpagesize.patch +4f110dc9c8d4754fbda841492ce796b4 glibc-2.14.1-cpuid-1.patch 13bdfb7db1654d9c3d7934d24479a6c4 glibc-2.14.1-fixes-1.patch d1f28cb98acb9417fe52596908bbb9fd glibc-2.14.1-gcc_fix-1.patch 740e71017059a4290761db0cc9dd63f3 glibc-2.14.1-sort-1.patch diff --git a/glibc/.md5sum.x86_64 b/glibc/.md5sum.x86_64 index 956a2931a..f67352a4d 100644 --- a/glibc/.md5sum.x86_64 +++ b/glibc/.md5sum.x86_64 @@ -1,5 +1,6 @@ 3887f95991887096a4de8760541bf7fe SUPPORTED a3ac6f318d680347bb6e2805d42b73b2 glibc-2.12.1-static-shared-getpagesize.patch +4f110dc9c8d4754fbda841492ce796b4 glibc-2.14.1-cpuid-1.patch 13bdfb7db1654d9c3d7934d24479a6c4 glibc-2.14.1-fixes-1.patch d1f28cb98acb9417fe52596908bbb9fd glibc-2.14.1-gcc_fix-1.patch 740e71017059a4290761db0cc9dd63f3 glibc-2.14.1-sort-1.patch diff --git a/glibc/Pkgfile b/glibc/Pkgfile index 967582386..f09db7201 100755 --- a/glibc/Pkgfile +++ b/glibc/Pkgfile @@ -13,6 +13,7 @@ source=(http://ftp.gnu.org/gnu/glibc/$name-$version.tar.xz 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) @@ -32,39 +33,35 @@ build() { 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 - mv ../SUPPORTED localedata/ mkdir -v ../glibc-build - cd ../glibc-build + cd ../glibc-build case `uname -m` in - i?86) echo "CFLAGS += -march=i486 -mtune=native -O3 -pipe" > configparms ;; + i?86) echo "CFLAGS += -march=i486 -mtune=native -O3 -pipe" > configparms ;; esac ../$name-$version/configure --prefix=/usr \ - --with-headers=$PKG/usr/include \ + --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.18 \ - --libexecdir=/usr/lib/glibc + --libexecdir=/usr/lib/glibc make make install_root=$PKG install - make install_root=$PKG localedata/install-locales - cp ../{nsswitch.conf,ld.so.conf} $PKG/etc + make install_root=$PKG localedata/install-locales + cp ../{nsswitch.conf,ld.so.conf} $PKG/etc if [ -f $PKG/usr/share/info/dir ]; then rm $PKG/usr/share/info/dir fi - for i in drm.h drm_sarea.h i915_drm.h \ - mga_drm.h r128_drm.h radeon_drm.h savage_drm.h \ - sis_drm.h via_drm.h drm_mode.h nouveau_drm.h - do rm $PKG/usr/include/drm/$i - done + rm $PKG/usr/include/drm/{drm.h,drm_sarea.h,i915_drm.h,mga_drm.h,r128_drm.h,radeon_drm.h,savage_drm.h,sis_drm.h,via_drm.h,drm_mode.h,nouveau_drm.h} } diff --git a/glibc/post-install b/glibc/post-install new file mode 100644 index 000000000..6051cb378 --- /dev/null +++ b/glibc/post-install @@ -0,0 +1 @@ +grep 'include /etc/ld\.so\.conf\.d/\*\.conf' /etc/ld.so.conf > /dev/null|| echo "include /etc/ld.so.conf.d/*.conf" >> /etc/ld.so.conf |