[Glibc-bsd-commits] r1687 - trunk/glibc-ports/patches

[Petr Salinger]

Author: ps-guest
Date: 2006-10-16 09:26:27 +0000 (Mon, 16 Oct 2006)
New Revision: 1687

Added:
   trunk/glibc-ports/patches/scripts.patch
Log:
* update for glibc 2.5



Copied: trunk/glibc-ports/patches/scripts.patch (from rev 1685, trunk/glibc-2.3-head/patches/scripts.patch)
===================================================================
--- trunk/glibc-ports/patches/scripts.patch	                        (rev 0)
+++ trunk/glibc-ports/patches/scripts.patch	2006-10-16 09:26:27 UTC (rev 1687)
@@ -0,0 +1,117 @@
+diff -urN glibc-2.3.2.orig/abi-tags glibc-2.3.2/abi-tags
+--- abi-tags	2002-09-21 02:28:19.000000000 +0200
++++ abi-tags	2005-06-12 17:58:26.000000000 +0200
+@@ -22,7 +22,7 @@
+ 
+ .*-sun-solaris2.*	2	2.0.0	# just an arbitrary value
+ 
+-.*-.*-freebsd.*-gnu.*	3	4.0.0	# earliest compatible kernel version
++.*-.*-kfreebsd.*	3	5.4.0	# earliest compatible kernel version
+ 
+ # There is no catch-all default here because every supported OS that uses
+ # ELF must have its own unique ABI tag.
+diff -urN glibc-2.3.2.orig/configure glibc-2.3.2/configure
+--- configure	2005-06-12 17:39:18.000000000 +0200
++++ configure	2005-06-12 18:02:40.000000000 +0200
+@@ -1742,7 +1742,7 @@
+ # i586-linuxaout is mangled into i586-pc-linux-gnuaout
+ linux*ecoff* | linux*aout* | gnu*aout* | gnu*ecoff*)
+   ;;
+-gnu* | linux* | freebsd* | netbsd* | sysv4* | solaris2* | irix6*)
++gnu* | linux* | freebsd* | netbsd* | k*bsd* | sysv4* | solaris2* | irix6*)
+   # These systems (almost) always use the ELF format.
+   elf=yes
+   ;;
+@@ -1785,7 +1785,7 @@
+ ###
+ if test -z "$enable_hacker_mode"; then
+   case "$machine-$host_os" in
+-  *-linux* | *-gnu* | arm*-none* | powerpc-aix4.3.*)
++  *-linux* | *-gnu* | *-kfreebsd* | arm*-none* | powerpc-aix4.3.*)
+     ;;
+   *)
+     echo "*** The GNU C library is currently not available for this platform."
+@@ -1883,7 +1883,7 @@
+ case "$os" in
+ gnu*)
+   base_os=mach/hurd ;;
+-netbsd* | 386bsd* | freebsd* | bsdi*)
++netbsd* | 386bsd* | freebsd* | bsdi* | k*bsd*)
+   base_os=unix/bsd/bsd4.4 ;;
+ osf* | sunos* | ultrix* | newsos* | dynix* | *bsd*)
+   base_os=unix/bsd ;;
+diff -urN glibc-2.3.2.orig/configure.in glibc-2.3.2/configure.in
+--- configure.in	2005-06-12 17:39:21.000000000 +0200
++++ configure.in	2005-06-12 18:01:28.000000000 +0200
+@@ -316,7 +316,7 @@
+ # i586-linuxaout is mangled into i586-pc-linux-gnuaout
+ linux*ecoff* | linux*aout* | gnu*aout* | gnu*ecoff*)
+   ;;
+-gnu* | linux* | freebsd* | netbsd* | sysv4* | solaris2* | irix6*)
++gnu* | linux* | freebsd* | netbsd* | k*bsd* | sysv4* | solaris2* | irix6*)
+   # These systems (almost) always use the ELF format.
+   elf=yes
+   ;;
+@@ -359,7 +359,7 @@
+ ###
+ if test -z "$enable_hacker_mode"; then
+   case "$machine-$host_os" in
+-  *-linux* | *-gnu* | arm*-none* | powerpc-aix4.3.*)
++  *-linux* | *-gnu* | *-kfreebsd* | arm*-none* | powerpc-aix4.3.*)
+     ;;
+   *)
+     echo "*** The GNU C library is currently not available for this platform."
+@@ -458,7 +458,7 @@
+ case "$os" in
+ gnu*)
+   base_os=mach/hurd ;;
+-netbsd* | 386bsd* | freebsd* | bsdi*)
++netbsd* | 386bsd* | freebsd* | bsdi* | k*bsd*)
+   base_os=unix/bsd/bsd4.4 ;;
+ osf* | sunos* | ultrix* | newsos* | dynix* | *bsd*)
+   base_os=unix/bsd ;;
+diff -urN glibc-2.3.2.orig/shlib-versions glibc-2.3.2/shlib-versions
+--- shlib-versions	2002-09-05 11:31:49.000000000 +0200
++++ shlib-versions	2005-06-12 18:06:19.000000000 +0200
+@@ -26,6 +26,7 @@
+ x86_64-.*-linux.*       DEFAULT			GLIBC_2.2.5
+ powerpc64-.*-linux.*	DEFAULT			GLIBC_2.3
+ .*-.*-gnu-gnu.*		DEFAULT			GLIBC_2.2.6
++.*-.*-kfreebsd.*	DEFAULT			GLIBC_2.3
+ 
+ # Configuration		Library=version		Earliest symbol set (optional)
+ # -------------		---------------		------------------------------
+@@ -39,6 +40,7 @@
+ hppa.*-.*-.*		libm=6			GLIBC_2.2
+ .*-.*-linux.*		libm=6
+ .*-.*-gnu-gnu.*		libm=6
++.*-.*-kfreebsd.*	libm=1
+ 
+ # We provide libc.so.6 for Linux kernel versions 2.0 and later.
+ alpha.*-.*-linux.*	libc=6.1
+@@ -49,6 +51,7 @@
+ sparc64-.*-linux.*	libc=6			GLIBC_2.2
+ hppa.*-.*-.*		libc=6			GLIBC_2.2
+ .*-.*-linux.*		libc=6
++.*-.*-kfreebsd.*	libc=0.1
+ 
+ # libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release.
+ .*-.*-gnu-gnu.*		libmachuser=1
+@@ -73,6 +73,7 @@
+ powerpc64.*-.*-linux.*	ld=ld64.so.1		GLIBC_2.3
+ cris-.*-linux.*		ld=ld.so.1		GLIBC_2.2
+ x86_64-.*-linux.*	ld=ld-linux-x86-64.so.2	GLIBC_2.2.5
++x86_64-.*-kfreebsd.*	ld=ld-kfreebsd-x86-64.so.1
+ # We use the ELF ABI standard name for the default.
+ .*-.*-.*		ld=ld.so.1
+ 
+diff -urN glibc-2.3.2.orig/linuxthreads/shlib-versions glibc-2.3.2/linuxthreads/shlib-versions
+--- linuxthreads/shlib-versions	2002-09-05 12:14:21.000000000 +0200
++++ linuxthreads/shlib-versions	2005-06-15 01:40:37.000000000 +0200
+@@ -8,4 +8,5 @@
+ cris-.*-linux.*		libpthread=0		GLIBC_2.2
+ x86_64-.*-linux.*	libpthread=0		GLIBC_2.2.5
+ powerpc64-.*-linux.*	libpthread=0		GLIBC_2.3
+-.*-.*-linux.*		libpthread=0
++.*-.*-kfreebsd.*	libpthread=0		GLIBC_2.3
++.*-.*-.*		libpthread=0