From 0f53225f529b628f32856af3f6e93ddbf21c6617 Mon Sep 17 00:00:00 2001 From: tnut Date: Fri, 22 Oct 2010 22:01:41 +0200 Subject: glibc, port nettoyé MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/glibc/Pkgfile | 6 +++--- base/glibc/SUPPORTED | 40 ------------------------------------- base/glibc/gcc-4.5.0-glibc-01.patch | 27 ------------------------- base/glibc/ld.so.conf | 11 ---------- base/glibc/nsswitch.conf | 15 -------------- 5 files changed, 3 insertions(+), 96 deletions(-) delete mode 100644 base/glibc/SUPPORTED delete mode 100644 base/glibc/gcc-4.5.0-glibc-01.patch delete mode 100644 base/glibc/ld.so.conf delete mode 100644 base/glibc/nsswitch.conf (limited to 'base') diff --git a/base/glibc/Pkgfile b/base/glibc/Pkgfile index 906a0fc56..4de3c040b 100755 --- a/base/glibc/Pkgfile +++ b/base/glibc/Pkgfile @@ -8,10 +8,10 @@ version=2.11.2 release=1 kernelversion=2.6.34 source=( http://ftp.gnu.org/gnu/glibc/$name-$version.tar.bz2 \ - gcc-4.5.0-glibc-01.patch + http://nutyx.meticul.eu/files/patchs/$name/gcc-4.5.0-glibc-01.patch \ http://www.linuxfromscratch.org/patches/lfs/development/glibc-2.11.2-gcc_fix-1.patch \ - http://www.kernel.org/pub/linux/kernel/v2.6/linux-${kernelversion}.tar.bz2 - nsswitch.conf ld.so.conf SUPPORTED) + http://www.kernel.org/pub/linux/kernel/v2.6/linux-${kernelversion}.tar.bz2 \ + http://nutyx.meticul.eu/files/patchs/$name/{nsswitch.conf,ld.so.conf,SUPPORTED}) build() { diff --git a/base/glibc/SUPPORTED b/base/glibc/SUPPORTED deleted file mode 100644 index c3f6e4fde..000000000 --- a/base/glibc/SUPPORTED +++ /dev/null @@ -1,40 +0,0 @@ -# This file names the currently supported and somewhat tested locales. -# If you have any additions please file a glibc bug report. -SUPPORTED-LOCALES=\ -de_BE.UTF-8/UTF-8 \ -de_BE/ISO-8859-1 \ -de_BE@euro/ISO-8859-15 \ -de_CH.UTF-8/UTF-8 \ -de_CH/ISO-8859-1 \ -de_DE.UTF-8/UTF-8 \ -de_DE/ISO-8859-1 \ -de_DE@euro/ISO-8859-15 \ -de_LU.UTF-8/UTF-8 \ -de_LU/ISO-8859-1 \ -de_LU@euro/ISO-8859-15 \ -en_IE/ISO-8859-1 \ -en_IE@euro/ISO-8859-15 \ -en_IN/UTF-8 \ -en_NZ.UTF-8/UTF-8 \ -en_NZ/ISO-8859-1 \ -en_PH.UTF-8/UTF-8 \ -en_PH/ISO-8859-1 \ -en_SG.UTF-8/UTF-8 \ -en_US.UTF-8/UTF-8 \ -en_US/ISO-8859-1 \ -es_MX.UTF-8/UTF-8 \ -es_MX/ISO-8859-1 \ -fa_IR/UTF-8 \ -fr_BE/ISO-8859-1 \ -fr_BE.UTF-8/UTF-8 \ -fr_BE@euro/ISO-8859-15 \ -fr_CA.UTF-8/UTF-8 \ -fr_CA/ISO-8859-1 \ -fr_CH.UTF-8/UTF-8 \ -fr_CH/ISO-8859-1 \ -fr_FR.UTF-8/UTF-8 \ -fr_FR/ISO-8859-1 \ -fr_FR@euro/ISO-8859-15 \ -fr_LU.UTF-8/UTF-8 \ -fr_LU/ISO-8859-1 \ -fr_LU@euro/ISO-8859-15 \ diff --git a/base/glibc/gcc-4.5.0-glibc-01.patch b/base/glibc/gcc-4.5.0-glibc-01.patch deleted file mode 100644 index 4c527a1db..000000000 --- a/base/glibc/gcc-4.5.0-glibc-01.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- glibc-2.11.1-orig/nptl/sysdeps/pthread/pt-initfini.c 2009-12-08 21:10:20.000000000 +0100 -+++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c 2010-04-18 12:09:03.000000000 +0200 -@@ -45,6 +45,11 @@ - /* Embed an #include to pull in the alignment and .end directives. */ - asm ("\n#include \"defs.h\""); - -+asm ("\n#if defined __i686 && defined __ASSEMBLER__"); -+asm ("\n#undef __i686"); -+asm ("\n#define __i686 __i686"); -+asm ("\n#endif"); -+ - /* The initial common code ends here. */ - asm ("\n/*@HEADER_ENDS*/"); - ---- glibc-2.11.1-orig/sysdeps/unix/sysv/linux/i386/sysdep.h 2009-12-08 21:10:20.000000000 +0100 -+++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h 2010-04-18 12:25:09.000000000 +0200 -@@ -29,6 +29,10 @@ - #include - #include - -+#if defined __i686 && defined __ASSEMBLER__ -+#undef __i686 -+#define __i686 __i686 -+#endif - - /* For Linux we can use the system call table in the header file - /usr/include/asm/unistd.h diff --git a/base/glibc/ld.so.conf b/base/glibc/ld.so.conf deleted file mode 100644 index ac7c9a1a0..000000000 --- a/base/glibc/ld.so.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Begin of /etc/ld.so.conf - -/usr/local/lib -/opt/lib -/opt/kde/lib -/usr/X11R6/lib -/opt/qt/lib -/opt/gnome/lib -/opt/kde3/lib -# End of /etc/ld.so.conf - diff --git a/base/glibc/nsswitch.conf b/base/glibc/nsswitch.conf deleted file mode 100644 index f3ccfa659..000000000 --- a/base/glibc/nsswitch.conf +++ /dev/null @@ -1,15 +0,0 @@ -# Begin /etc/nsswitch.conf - -passwd: files -group: files -shadow: files - -hosts: files dns -network: files - -protocols: files -services: files -ethers: files -rpc: files - -# End of /etc/nsswitch.conf -- cgit v1.2.3-54-g00ecf