Cody Schafer avatar Cody Schafer committed 1e578c7

Import from top of tree.

Comments (0)

Files changed (7)

+^\.hg
+^\.mq
+syntax: glob
+status
+guards
+# HG changeset patch
+# User Cody Schafer <jmesmon@gmail.com>
+# Date 1340909866 25200
+# Node ID ef204828ca6a556049531212e011d01305b044ad
+# Parent  37831a33e07e0aa865586d3b13b5b7824f35b4c1
+Add option for strace 4.7
+
+diff -r 37831a33e07e -r ef204828ca6a config/debug/strace.in
+--- a/config/debug/strace.in	Tue Oct 16 20:57:44 2012 +0200
++++ b/config/debug/strace.in	Thu Jun 28 11:57:46 2012 -0700
+@@ -8,6 +8,12 @@
+ # Don't remove next line
+ # CT_INSERT_VERSION_BELOW
+ 
++config STRACE_V_4_7
++    bool
++    prompt "4.7 (EXPERIMENTAL)"
++    depends on EXPERIMENTAL
++    depends on CONFIGURE_has_xz
++
+ config STRACE_V_4_6
+     bool
+     prompt "4.6 (EXPERIMENTAL)"
+@@ -48,6 +54,7 @@
+     string
+ # Don't remove next line
+ # CT_INSERT_VERSION_STRING_BELOW
++    default "4.7" if STRACE_V_4_7
+     default "4.6" if STRACE_V_4_6
+     default "4.5.20" if STRACE_V_4_5_20
+     default "4.5.19" if STRACE_V_4_5_19
+# HG changeset patch
+# User Cody Schafer <jmesmon@gmail.com>
+# Date 1340916525 25200
+# Node ID c130666cbf166e2be70125049b94b1b982eaf7c1
+# Parent  ef204828ca6a556049531212e011d01305b044ad
+add glibc 2.15 support.
+
+diff -r ef204828ca6a -r c130666cbf16 config/libc/glibc.in
+--- a/config/libc/glibc.in	Thu Jun 28 11:57:46 2012 -0700
++++ b/config/libc/glibc.in	Thu Jun 28 13:48:45 2012 -0700
+@@ -13,6 +13,10 @@
+ # Don't remove next line
+ # CT_INSERT_VERSION_BELOW
+ 
++config LIBC_GLIBC_V_2_15
++    bool
++    prompt "2.15"
++
+ config LIBC_GLIBC_V_2_14_1
+     bool
+     prompt "2.14.1"
+@@ -87,6 +91,7 @@
+     string
+ # Don't remove next line
+ # CT_INSERT_VERSION_STRING_BELOW
++    default "2.15" if LIBC_GLIBC_V_2_15
+     default "2.14.1" if LIBC_GLIBC_V_2_14_1
+     default "2.14" if LIBC_GLIBC_V_2_14
+     default "2.13" if LIBC_GLIBC_V_2_13
+# HG changeset patch
+# User Cody Schafer <jmesmon@gmail.com>
+# Date 1348521141 25200
+# Node ID de4f2cc98766248c1cc8bc83e672f564c5009a96
+# Parent  c130666cbf166e2be70125049b94b1b982eaf7c1
+fix multilib for broken gcc configure
+
+gcc's configure passes the --enable-multilib flags into target builds, which
+breaks things (like zlib when using the bundled one).
+
+Workaround by only passing the explicit --disable-multilib and omitting
+--enable-multilib. According to the gcc bug report on this problem, all
+platforms that use multilib enable it by default, so we can safely omit the
+--enable-multilib and get a multilib toolchain.
+
+diff -r c130666cbf16 -r de4f2cc98766 scripts/build/cc/gcc.sh
+--- a/scripts/build/cc/gcc.sh	Thu Jun 28 13:48:45 2012 -0700
++++ b/scripts/build/cc/gcc.sh	Mon Sep 24 14:12:21 2012 -0700
+@@ -349,9 +349,7 @@
+         extra_config+=("--with-system-zlib")
+     fi
+ 
+-    if [ "${CT_MULTILIB}" = "y" ]; then
+-        extra_config+=("--enable-multilib")
+-    else
++    if [ "${CT_MULTILIB}" = "n" ]; then
+         extra_config+=("--disable-multilib")
+     fi
+ 
+[paths]
+default = https://bitbucket.org/jmesmon/crosstool-ng-pq/
+3080.diff
+3081.diff
+3082.diff
+stuff
+# HG changeset patch
+# Parent 18b385f8aa1cc7ed5ea7cc78409104d5076577f3
+diff -r 18b385f8aa1c -r b7146ca718a3 config/libc/glibc.in
+--- a/config/libc/glibc.in	Thu Jun 28 13:54:24 2012 -0700
++++ b/config/libc/glibc.in	Fri Jul 20 10:28:27 2012 -0700
+@@ -41,6 +41,10 @@
+ # Don't remove next line
+ # CT_INSERT_VERSION_BELOW
+ 
++config LIBC_GLIBC_V_2_16_0
++    bool
++    prompt "2.16.0"
++
+ config LIBC_GLIBC_V_2_15
+     bool
+     prompt "2.15"
+@@ -119,6 +123,7 @@
+     string
+ # Don't remove next line
+ # CT_INSERT_VERSION_STRING_BELOW
++    default "2.16.0" if LIBC_GLIBC_V_2_16_0
+     default "2.15" if LIBC_GLIBC_V_2_15
+     default "2.14.1" if LIBC_GLIBC_V_2_14_1
+     default "2.14" if LIBC_GLIBC_V_2_14
+diff -r 18b385f8aa1c -r b7146ca718a3 scripts/build/libc/glibc-eglibc.sh-common
+--- a/scripts/build/libc/glibc-eglibc.sh-common	Thu Jun 28 13:54:24 2012 -0700
++++ b/scripts/build/libc/glibc-eglibc.sh-common	Fri Jul 20 10:28:27 2012 -0700
+@@ -360,6 +360,7 @@
+         --disable-profile                                           \
+         --without-gd                                                \
+         --with-headers="${CT_HEADERS_DIR}"                          \
++	--disable-nscd						    \
+         "${extra_config[@]}"                                        \
+         "${CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY[@]}"
+ 
+@@ -402,12 +403,14 @@
+             #  error: bits/syscall.h: No such file or directory
+             # solved by following copy; see http://sourceware.org/ml/crossgcc/2005-05/msg00168.html
+             # but it breaks arm, see http://sourceware.org/ml/crossgcc/2006-01/msg00091.html
+-            case "${CT_ARCH}" in
+-                arm)    ;;
+-                *)  CT_DoExecLog ALL cp -v "misc/syscall-list.h"            \
+-                                           "${CT_HEADERS_DIR}/bits/syscall.h"
+-                    ;;
+-            esac
++            if CT_VerCmp "${CT_LIBC_VERSION}" -lt "2.5"; then
++		    case "${CT_ARCH}" in
++			arm)    ;;
++			*)  CT_DoExecLog ALL cp -v "misc/syscall-list.h"            \
++						   "${CT_HEADERS_DIR}/bits/syscall.h"
++			    ;;
++		    esac
++            fi
+         fi
+     fi # libc_headers == y
+ 
+diff -r 18b385f8aa1c -r b7146ca718a3 scripts/functions
+--- a/scripts/functions	Thu Jun 28 13:54:24 2012 -0700
++++ b/scripts/functions	Fri Jul 20 10:28:27 2012 -0700
+@@ -2,6 +2,23 @@
+ # Copyright 2007 Yann E. MORIN
+ # Licensed under the GPL v2. See COPYING in the root of this package
+ 
++CT__lw () {
++	printf "%s\n%s\n" "$1" "$2" | sort -V | head -n1
++}
++
++CT_VerCmp() {
++	CT_DoLog INFO "vercmp: $1 $2 $3 \"`CT__lw \"$1\" \"$3\"`\""
++	case "$2" in
++	-eq|=|==)      [ "$1" = "$3" ] ; return ;;
++	-lt|\<)        [ "`CT__lw \"$1\" \"$3\"`" = "$1" ] ; return ;;
++	-gt|\>)	       [ "`CT__lw \"$1\" \"$3\"`" = "$3" ] ; return ;;
++	-lte|\<=|=\<)  [ "`CT__lw \"$1\" \"$3\"`" = "$1" -o "$1" = "$3" ] ; return ;;
++	-gte|\>=|=\>)  [ "`CT__lw \"$1\" \"$3\"`" = "$3" -o "$1" = "$3" ] ; return ;;
++	*)	CT_Abort "Unknown comparison type $2" ;;
++	esac
++}
++
++
+ # Prepare the fault handler
+ CT_OnError() {
+     local ret=$?
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.