SliTaz Repositories

     1.1 --- a/glibc/receipt	Sun Feb 20 03:18:35 2011 +0100
     1.2 +++ b/glibc/receipt	Sun Feb 20 03:26:10 2011 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="glibc"
     1.7 -VERSION="2.12.2"
     1.8 +VERSION="2.13"
     1.9  CATEGORY="meta"
    1.10  SHORT_DESC="The GNU C libraries. This package is used to compile the libc."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 @@ -19,7 +19,7 @@
    1.13  	cd $src
    1.14  
    1.15  	# Fix a bug that prevents Glibc from building with GCC-4.5.2:
    1.16 -	patch -Np1 -i ../stuff/glibc-2.12.2-gcc_fix-1.patch
    1.17 +	patch -Np1 -i ../stuff/glibc-2.13-gcc_fix-1.patch
    1.18  
    1.19  	# Build in a separate directory.
    1.20  	mkdir ../glibc-build && cd ../glibc-build
    1.21 @@ -58,10 +58,16 @@
    1.22  	sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|" \
    1.23  		scripts/test-installation.pl
    1.24  	unset DL
    1.25 +	sed -i -e 's/"db1"/& \&\& $name ne "nss_test1"/' scripts/test-installation.pl
    1.26  	sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in
    1.27  
    1.28  	# Fix a bug that prevents Glibc from building with GCC-4.5.2:
    1.29 -	patch -Np1 -i ../stuff/glibc-2.12.2-gcc_fix-1.patch
    1.30 +	patch -Np1 -i ../stuff/glibc-2.13-gcc_fix-1.patch
    1.31 +
    1.32 +	# Fix a stack imbalance that occurs under some conditions:
    1.33 +	sed -i '195,213 s/PRIVATE_FUTEX/FUTEX_CLOCK_REALTIME/' \
    1.34 +		nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S \
    1.35 +		nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
    1.36  
    1.37  	mkdir ../glibc-build
    1.38  	cd ../glibc-build

     2.1 --- a/glibc/stuff/glibc-2.12.2-gcc_fix-1.patch	Sun Feb 20 03:18:35 2011 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,49 +0,0 @@
     2.4 -Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
     2.5 -Date:                    2010-04-18
     2.6 -Initial Package Version: 2.11.1
     2.7 -Upstream Status:         Not Submitted
     2.8 -Origin:                  http://www.eglibc.org/archives/patches/msg00073.html
     2.9 -Description:             Fixes the following build problem with GCC-4.5.0:
    2.10 -
    2.11 -/mnt/lfs/sources/libc-build/math/s_frexp.os.dt -MT /mnt/lfs/sources/libc-build/math/s_frexp.os
    2.12 -./sysdeps/i386/fpu/s_frexp.S: Assembler messages:
    2.13 -./sysdeps/i386/fpu/s_frexp.S:66: Error: invalid identifier for ".ifdef"
    2.14 -./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
    2.15 -./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
    2.16 -./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
    2.17 -./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `.'
    2.18 -./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
    2.19 -./sysdeps/i386/fpu/s_frexp.S:66: Error: expected comma after name `' in .size directive
    2.20 -./sysdeps/i386/fpu/s_frexp.S:66: Error: ".endif" without ".if"
    2.21 -./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after expression
    2.22 -make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1
    2.23 -
    2.24 -diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c
    2.25 ---- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-12-08 20:10:20.000000000 +0000
    2.26 -+++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c	2010-04-17 11:34:06.882681001 +0000
    2.27 -@@ -45,6 +45,11 @@
    2.28 - /* Embed an #include to pull in the alignment and .end directives. */
    2.29 - asm ("\n#include \"defs.h\"");
    2.30 - 
    2.31 -+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
    2.32 -+asm ("\n#undef __i686");
    2.33 -+asm ("\n#define __i686 __i686");
    2.34 -+asm ("\n#endif");
    2.35 -+
    2.36 - /* The initial common code ends here. */
    2.37 - asm ("\n/*@HEADER_ENDS*/");
    2.38 - 
    2.39 -diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h
    2.40 ---- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-12-08 20:10:20.000000000 +0000
    2.41 -+++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-04-17 11:34:06.882681001 +0000
    2.42 -@@ -29,6 +29,10 @@
    2.43 - #include <dl-sysdep.h>
    2.44 - #include <tls.h>
    2.45 - 
    2.46 -+#if defined __i686 && defined __ASSEMBLER__
    2.47 -+#undef __i686
    2.48 -+#define __i686 __i686
    2.49 -+#endif
    2.50 - 
    2.51 - /* For Linux we can use the system call table in the header file
    2.52 - 	/usr/include/asm/unistd.h

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/glibc/stuff/glibc-2.13-gcc_fix-1.patch	Sun Feb 20 03:26:10 2011 +0100
     3.3 @@ -0,0 +1,49 @@
     3.4 +Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
     3.5 +Date:                    2010-04-18
     3.6 +Initial Package Version: 2.11.1
     3.7 +Upstream Status:         Not Submitted
     3.8 +Origin:                  http://www.eglibc.org/archives/patches/msg00073.html
     3.9 +Description:             Fixes the following build problem with GCC-4.5.0:
    3.10 +
    3.11 +/mnt/lfs/sources/libc-build/math/s_frexp.os.dt -MT /mnt/lfs/sources/libc-build/math/s_frexp.os
    3.12 +./sysdeps/i386/fpu/s_frexp.S: Assembler messages:
    3.13 +./sysdeps/i386/fpu/s_frexp.S:66: Error: invalid identifier for ".ifdef"
    3.14 +./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
    3.15 +./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
    3.16 +./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
    3.17 +./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `.'
    3.18 +./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
    3.19 +./sysdeps/i386/fpu/s_frexp.S:66: Error: expected comma after name `' in .size directive
    3.20 +./sysdeps/i386/fpu/s_frexp.S:66: Error: ".endif" without ".if"
    3.21 +./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after expression
    3.22 +make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1
    3.23 +
    3.24 +diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c
    3.25 +--- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-12-08 20:10:20.000000000 +0000
    3.26 ++++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c	2010-04-17 11:34:06.882681001 +0000
    3.27 +@@ -45,6 +45,11 @@
    3.28 + /* Embed an #include to pull in the alignment and .end directives. */
    3.29 + asm ("\n#include \"defs.h\"");
    3.30 + 
    3.31 ++asm ("\n#if defined __i686 && defined __ASSEMBLER__");
    3.32 ++asm ("\n#undef __i686");
    3.33 ++asm ("\n#define __i686 __i686");
    3.34 ++asm ("\n#endif");
    3.35 ++
    3.36 + /* The initial common code ends here. */
    3.37 + asm ("\n/*@HEADER_ENDS*/");
    3.38 + 
    3.39 +diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h
    3.40 +--- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-12-08 20:10:20.000000000 +0000
    3.41 ++++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-04-17 11:34:06.882681001 +0000
    3.42 +@@ -29,6 +29,10 @@
    3.43 + #include <dl-sysdep.h>
    3.44 + #include <tls.h>
    3.45 + 
    3.46 ++#if defined __i686 && defined __ASSEMBLER__
    3.47 ++#undef __i686
    3.48 ++#define __i686 __i686
    3.49 ++#endif
    3.50 + 
    3.51 + /* For Linux we can use the system call table in the header file
    3.52 + 	/usr/include/asm/unistd.h