From 8c8090bf2a49090942d2a729467ac45bcc305370 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Thu, 10 Nov 2011 17:46:09 +0100 Subject: [PATCH] glibc: Updated (2.13 -> 2.14) --- base/glibc/any-cc-as-ld-ok.patch.toolchain | 67 ++++++++++------------ base/glibc/glibc.desc | 6 +- base/glibc/no_rquota_x.patch | 31 ---------- base/glibc/sparc64-tls.patch | 31 ---------- 4 files changed, 34 insertions(+), 101 deletions(-) delete mode 100644 base/glibc/no_rquota_x.patch delete mode 100644 base/glibc/sparc64-tls.patch diff --git a/base/glibc/any-cc-as-ld-ok.patch.toolchain b/base/glibc/any-cc-as-ld-ok.patch.toolchain index bc857229b..b71703e19 100644 --- a/base/glibc/any-cc-as-ld-ok.patch.toolchain +++ b/base/glibc/any-cc-as-ld-ok.patch.toolchain @@ -18,10 +18,9 @@ At toolchain stage we only install glibc headers, so any version of gcc, as and ld are ok for us. -diff -ruN glibc-2.11.2-orig/configure glibc-2.11.2/configure ---- glibc-2.11.2-orig/configure 2010-05-19 22:38:20.000000000 +0200 -+++ glibc-2.11.2/configure 2010-09-01 19:45:45.848092507 +0200 -@@ -4864,9 +4864,9 @@ +--- glibc-2.14.1/configure.orig 2011-10-07 11:48:55.000000000 +0200 ++++ glibc-2.14.1/configure 2011-11-10 18:23:48.900099502 +0100 +@@ -4760,9 +4760,9 @@ ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -32,8 +31,8 @@ diff -ruN glibc-2.11.2-orig/configure glibc-2.11.2/configure + XXX) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac - { $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5 -@@ -4927,9 +4927,9 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5 +@@ -4823,9 +4823,9 @@ ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -44,8 +43,8 @@ diff -ruN glibc-2.11.2-orig/configure glibc-2.11.2/configure + XXX) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac - { $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5 -@@ -5045,9 +5045,9 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5 +@@ -4939,9 +4939,9 @@ ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -56,33 +55,29 @@ diff -ruN glibc-2.11.2-orig/configure glibc-2.11.2/configure + XXX) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac - { $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5 -diff -ruN glibc-2.11.2-orig/nptl/sysdeps/pthread/configure glibc-2.11.2/nptl/sysdeps/pthread/configure ---- glibc-2.11.2-orig/nptl/sysdeps/pthread/configure 2010-05-19 22:38:20.000000000 +0200 -+++ glibc-2.11.2/nptl/sysdeps/pthread/configure 2010-09-01 19:49:38.564420017 +0200 -@@ -3,14 +3,14 @@ - if test "x$libc_cv_gcc___thread" != xyes; then - { { $as_echo "$as_me:$LINENO: error: compiler support for __thread is required" >&5 - $as_echo "$as_me: error: compiler support for __thread is required" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5 +--- glibc-2.14.1/nptl/sysdeps/pthread/configure.orig 2011-10-07 11:48:55.000000000 +0200 ++++ glibc-2.14.1/nptl/sysdeps/pthread/configure 2011-11-10 18:33:29.760099780 +0100 +@@ -128,22 +128,6 @@ + } # ac_fn_c_try_link + # This file is generated from configure.in by Autoconf. DO NOT EDIT! - if test "x${libc_cv_visibility_attribute}" != xyes || - test "x${libc_cv_broken_visibility_attribute}" != xno; then - { { $as_echo "$as_me:$LINENO: error: working compiler support for visibility attribute is required" >&5 - $as_echo "$as_me: error: working compiler support for visibility attribute is required" >&2;} -- { (exit 1); exit 1; }; } -+ } - fi +-if test "x$libc_cv_gcc___thread" != xyes; then +- as_fn_error $? "compiler support for __thread is required" "$LINENO" 5 +-fi +- +-if test "x${libc_cv_visibility_attribute}" != xyes || +- test "x${libc_cv_broken_visibility_attribute}" != xno; then +- as_fn_error $? "working compiler support for visibility attribute is required" "$LINENO" 5 +-fi +- +-if test "x$libc_cv_asm_cfi_directives" != xyes; then +- case "$base_machine" in +- i386 | x86_64 | powerpc | s390) +- as_fn_error $? "CFI directive support in assembler is required" "$LINENO" 5 ;; +- *) ;; +- esac +-fi - if test "x$libc_cv_asm_cfi_directives" != xyes; then -@@ -18,7 +18,7 @@ - i386 | x86_64 | powerpc | s390) - { { $as_echo "$as_me:$LINENO: error: CFI directive support in assembler is required" >&5 - $as_echo "$as_me: error: CFI directive support in assembler is required" >&2;} -- { (exit 1); exit 1; }; } ;; -+ } ;; - *) ;; - esac - fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forced unwind support" >&5 diff --git a/base/glibc/glibc.desc b/base/glibc/glibc.desc index ea61576f3..281440f1b 100644 --- a/base/glibc/glibc.desc +++ b/base/glibc/glibc.desc @@ -33,8 +33,8 @@ [L] GPL [S] Stable -[V] 2.13 +[V] 2.14 [P] X 01---5---9 101.600 -[D] 3619450188 glibc-2.13.tar.bz2 http://ftp.gnu.org/gnu/glibc/ -[D] 3649139458 glibc-ports-2.13.tar.bz2 http://ftp.gnu.org/gnu/glibc/ +[D] 3922420920 glibc-2.14.tar.bz2 http://ftp.gnu.org/gnu/glibc/ +[D] 3052977586 glibc-ports-2.14.tar.bz2 http://ftp.gnu.org/gnu/glibc/ diff --git a/base/glibc/no_rquota_x.patch b/base/glibc/no_rquota_x.patch deleted file mode 100644 index f639daba6..000000000 --- a/base/glibc/no_rquota_x.patch +++ /dev/null @@ -1,31 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../glibc/no_rquota_x.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - - -A newer (better) rquota.x / rquota.h comes with the 'quota' package. - ---- ./sunrpc/Makefile.orig 2003-01-08 11:55:19.000000000 +0100 -+++ ./sunrpc/Makefile 2003-01-08 11:55:22.000000000 +0100 -@@ -46,7 +46,7 @@ - - rpcsvc = bootparam_prot.x nlm_prot.x rstat.x \ - yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \ -- rusers.x spray.x nfs_prot.x rquota.x key_prot.x -+ rusers.x spray.x nfs_prot.x key_prot.x - headers = $(addprefix rpc/,auth.h auth_unix.h clnt.h netdb.h pmap_clnt.h \ - pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h svc.h \ - svc_auth.h types.h xdr.h auth_des.h \ diff --git a/base/glibc/sparc64-tls.patch b/base/glibc/sparc64-tls.patch deleted file mode 100644 index bb8937746..000000000 --- a/base/glibc/sparc64-tls.patch +++ /dev/null @@ -1,31 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../glibc/sparc64-tls.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -Basic fixup for sparc TLS. Some bits are out of the glibc's CVS. - - - Rene Rebe - ---- glibc-2.3-20051010/sysdeps/sparc/sparc64/elf/configure.vanilla 2005-10-12 12:44:13.000000000 +0200 -+++ glibc-2.3-20051010/sysdeps/sparc/sparc64/elf/configure 2005-10-12 12:44:32.000000000 +0200 -@@ -35,7 +35,7 @@ - sethi %tle_hix22(foo), %l1 - xor %l1, %tle_lox10(foo), %l1 - EOF --if { ac_try='${CC-cc} -o conftest.bin $CFLAGS conftest.s 1>&5' -+if { ac_try='${CC-cc} -c -o conftest.bin $CFLAGS conftest.s 1>&5' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$?