Browse Source

glibc: rediffed patch for accepting any 'cc', 'ld' and 'as' against glibc 2.11.2

user/karasz/next/updates
Christian Wiese 14 years ago
parent
commit
2c05d3862c
  1. 34
      base/glibc/any-cc-as-ld-ok.patch.toolchain

34
base/glibc/any-cc-as-ld-ok.patch.toolchain

@ -18,14 +18,14 @@
At toolchain stage we only install glibc headers, so any version of gcc, as At toolchain stage we only install glibc headers, so any version of gcc, as
and ld are ok for us. and ld are ok for us.
diff -ruN glibc-2.10.1-orig/configure glibc-2.10.1/configure diff -ruN glibc-2.11.2-orig/configure glibc-2.11.2/configure
--- glibc-2.10.1-orig/configure 2009-05-17 14:19:31.000000000 +0200 --- glibc-2.11.2-orig/configure 2010-05-19 22:38:20.000000000 +0200
+++ glibc-2.10.1/configure 2010-04-08 11:24:13.976339997 +0200 +++ glibc-2.11.2/configure 2010-09-01 19:45:45.848092507 +0200
@@ -4839,9 +4839,9 @@ @@ -4864,9 +4864,9 @@
ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9]*|[3-9].*) - 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
+ *) + *)
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
@ -33,11 +33,11 @@ diff -ruN glibc-2.10.1-orig/configure glibc-2.10.1/configure
esac esac
{ $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5 { $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5
@@ -4902,9 +4902,9 @@ @@ -4927,9 +4927,9 @@
ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` 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 case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9]*|[3-9].*) - 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
+ *) + *)
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
@ -45,7 +45,7 @@ diff -ruN glibc-2.10.1-orig/configure glibc-2.10.1/configure
esac esac
{ $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5 { $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5
@@ -5020,9 +5020,9 @@ @@ -5045,9 +5045,9 @@
ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'` ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
case $ac_prog_version in case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@ -57,21 +57,21 @@ diff -ruN glibc-2.10.1-orig/configure glibc-2.10.1/configure
esac esac
{ $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5 { $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5
diff -ruN glibc-2.10.1-orig/nptl/sysdeps/pthread/configure glibc-2.10.1/nptl/sysdeps/pthread/configure diff -ruN glibc-2.11.2-orig/nptl/sysdeps/pthread/configure glibc-2.11.2/nptl/sysdeps/pthread/configure
--- glibc-2.10.1-orig/nptl/sysdeps/pthread/configure 2009-05-17 14:19:31.000000000 +0200 --- glibc-2.11.2-orig/nptl/sysdeps/pthread/configure 2010-05-19 22:38:20.000000000 +0200
+++ glibc-2.10.1/nptl/sysdeps/pthread/configure 2010-04-08 11:27:38.816841823 +0200 +++ glibc-2.11.2/nptl/sysdeps/pthread/configure 2010-09-01 19:49:38.564420017 +0200
@@ -3,14 +3,14 @@ @@ -3,14 +3,14 @@
if test "x$libc_cv_gcc___thread" != xyes; then if test "x$libc_cv_gcc___thread" != xyes; then
{ { echo "$as_me:$LINENO: error: compiler support for __thread is required" >&5 { { $as_echo "$as_me:$LINENO: error: compiler support for __thread is required" >&5
echo "$as_me: error: compiler support for __thread is required" >&2;} $as_echo "$as_me: error: compiler support for __thread is required" >&2;}
- { (exit 1); exit 1; }; } - { (exit 1); exit 1; }; }
+ } + }
fi fi
if test "x${libc_cv_visibility_attribute}" != xyes || if test "x${libc_cv_visibility_attribute}" != xyes ||
test "x${libc_cv_broken_visibility_attribute}" != xno; then test "x${libc_cv_broken_visibility_attribute}" != xno; then
{ { echo "$as_me:$LINENO: error: working compiler support for visibility attribute is required" >&5 { { $as_echo "$as_me:$LINENO: error: working compiler support for visibility attribute is required" >&5
echo "$as_me: error: working compiler support for visibility attribute is required" >&2;} $as_echo "$as_me: error: working compiler support for visibility attribute is required" >&2;}
- { (exit 1); exit 1; }; } - { (exit 1); exit 1; }; }
+ } + }
fi fi
@ -79,8 +79,8 @@ diff -ruN glibc-2.10.1-orig/nptl/sysdeps/pthread/configure glibc-2.10.1/nptl/sys
if test "x$libc_cv_asm_cfi_directives" != xyes; then if test "x$libc_cv_asm_cfi_directives" != xyes; then
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
i386 | x86_64 | powerpc | s390) i386 | x86_64 | powerpc | s390)
{ { echo "$as_me:$LINENO: error: CFI directive support in assembler is required" >&5 { { $as_echo "$as_me:$LINENO: error: CFI directive support in assembler is required" >&5
echo "$as_me: error: CFI directive support in assembler is required" >&2;} $as_echo "$as_me: error: CFI directive support in assembler is required" >&2;}
- { (exit 1); exit 1; }; } ;; - { (exit 1); exit 1; }; } ;;
+ } ;; + } ;;
*) ;; *) ;;

Loading…
Cancel
Save