Cody Schafer avatar Cody Schafer committed 7928383

Eliminate now uneeded patches.

Comments (0)

Files changed (6)

binutils-2.23.diff

-# HG changeset patch
-# Parent 5c67476c734240779d59f3181af137ce0b794a77
-
-diff -r 5c67476c7342 config/binutils/binutils.in
---- a/config/binutils/binutils.in	Tue Oct 30 00:22:25 2012 +0000
-+++ b/config/binutils/binutils.in	Sat Nov 10 18:22:14 2012 -0800
-@@ -8,6 +8,12 @@
- # Don't remove next line
- # CT_INSERT_VERSION_BELOW
- 
-+config BINUTILS_V_2_23
-+    bool
-+    prompt "2.23 (EXPERIMENTAL)"
-+    depends on EXPERIMENTAL
-+    select BINUTILS_2_23_or_later
-+
- config BINUTILS_V_2_22
-     bool
-     prompt "2.22 (EXPERIMENTAL)"
-@@ -74,6 +80,7 @@
-     string
- # Don't remove next line
- # CT_INSERT_VERSION_STRING_BELOW
-+    default "2.23" if BINUTILS_V_2_23
-     default "2.22" if BINUTILS_V_2_22
-     default "2.21.53" if BINUTILS_V_2_21_53
-     default "2.21.1a" if BINUTILS_V_2_21_1a
-@@ -84,6 +91,10 @@
-     default "2.16.1a" if BINUTILS_V_2_16_1a
-     default "custom" if BINUTILS_CUSTOM
- 
-+config BINUTILS_2_23_or_later
-+    bool
-+    select BINUTILS_2_22_or_later
-+
- config BINUTILS_2_22_or_later
-     bool
-     select BINUTILS_2_21_or_later

ct-ng-cc-custom.patch

+diff -r 08aecbc69f12 config/cc/gcc.in
+--- a/config/cc/gcc.in	Sun Aug 26 10:35:20 2012 +0100
++++ b/config/cc/gcc.in	Sat Oct 20 00:20:41 2012 -0500
+@@ -30,6 +30,10 @@
+       
+       Linaro: http://www.linaro.org/
+ 
++config CC_CUSTOM_LOCATION
++    string
++    prompt "Custom location to use for gcc sources"
++
+ choice
+     bool
+     prompt "gcc version"
+@@ -360,6 +364,7 @@
+ config CC_GCC_HAS_LIBQUADMATH
+     bool
+ 
++
+ config CC_VERSION
+     string
+ # Don't remove next line
+diff -r 08aecbc69f12 scripts/build/cc/gcc.sh
+--- a/scripts/build/cc/gcc.sh	Sun Aug 26 10:35:20 2012 +0100
++++ b/scripts/build/cc/gcc.sh	Sat Oct 20 00:20:41 2012 -0500
+@@ -17,24 +17,29 @@
+                       |sed -r -e 's/-.*//;'         \
+                     )"
+ 
+-    # Ah! gcc folks are kind of 'different': they store the tarballs in
+-    # subdirectories of the same name!
+-    # Arrgghh! Some of those versions does not follow this convention:
+-    # gcc-3.3.3 lives in releases/gcc-3.3.3, while gcc-2.95.* isn't in a
+-    # subdirectory!
+-    CT_GetFile "gcc-${CT_CC_VERSION}"                                                       \
+-               {ftp,http}://ftp.gnu.org/gnu/gcc{,{,/releases}/gcc-${CT_CC_VERSION}}         \
+-               ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/releases/gcc-${CT_CC_VERSION} \
+-               ftp://ftp.uvsq.fr/pub/gcc/snapshots/${CT_CC_VERSION}                         \
+-               "${linaro_base_url}/${linaro_series}/${linaro_version}/+download"
++    if [ -n "${CT_CC_CUSTOM_SOURCE}" ]; then
++	# TODO
++	CT_GetGeneric "${CT_CC_CUSTOM_SOURCE}"
++    else
++	# Ah! gcc folks are kind of 'different': they store the tarballs in
++	# subdirectories of the same name!
++	# Arrgghh! Some of those versions does not follow this convention:
++	# gcc-3.3.3 lives in releases/gcc-3.3.3, while gcc-2.95.* isn't in a
++	# subdirectory!
++	CT_GetFile "gcc-${CT_CC_VERSION}"                                                       \
++		   {ftp,http}://ftp.gnu.org/gnu/gcc{,{,/releases}/gcc-${CT_CC_VERSION}}         \
++		   ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/releases/gcc-${CT_CC_VERSION} \
++		   ftp://ftp.uvsq.fr/pub/gcc/snapshots/${CT_CC_VERSION}                         \
++		   "${linaro_base_url}/${linaro_series}/${linaro_version}/+download"
++    fi
+ 
+     # Starting with GCC 4.3, ecj is used for Java, and will only be
+     # built if the configure script finds ecj.jar at the top of the
+     # GCC source tree, which will not be there unless we get it and
+     # put it there ourselves
+     if [ "${CT_CC_LANG_JAVA_USE_ECJ}" = "y" ]; then
+-        CT_GetFile ecj-latest .jar ftp://gcc.gnu.org/pub/java   \
+-                                   ftp://sourceware.org/pub/java
++	CT_GetFile ecj-latest .jar ftp://gcc.gnu.org/pub/java   \
++				   ftp://sourceware.org/pub/java
+     fi
+ }
+ 
+@@ -330,9 +335,7 @@
+         extra_config+=("--with-system-zlib")
+     fi
+ 
+-    if [ "${CT_MULTILIB}" = "y" ]; then
+-        extra_config+=("--enable-multilib")
+-    else
++    if ! [ "${CT_MULTILIB}" = "y" ]; then
+         extra_config+=("--disable-multilib")
+     fi
+ 

gcc-4.7.3-add.diff

-# HG changeset patch
-# Parent 83000c51814c6a4fc126a41f05beadd7db45ae27
-
-diff -r 83000c51814c config/cc/gcc.in
---- a/config/cc/gcc.in	Sat Nov 10 18:22:33 2012 -0800
-+++ b/config/cc/gcc.in	Sat Nov 10 18:22:36 2012 -0800
-@@ -37,6 +37,11 @@
- # Don't remove next line
- # CT_INSERT_VERSION_BELOW
- 
-+config CC_V_4_7_3
-+    bool
-+    prompt "4.7.3"
-+    select CC_GCC_4_7
-+
- config CC_V_linaro_4_7_2012_10
-     bool
-     prompt "linaro-4.7-2012.10 (EXPERIMENTAL)"
-@@ -400,6 +405,7 @@
-     string
- # Don't remove next line
- # CT_INSERT_VERSION_STRING_BELOW
-+    default "4.7.3" if CC_V_4_7_3
-     default "linaro-4.7-2012.10" if CC_V_linaro_4_7_2012_10
-     default "4.7.2" if CC_V_4_7_2
-     default "4.7.1" if CC_V_4_7_1

gdb-7.5-add.diff

-# HG changeset patch
-# Parent f0e0974bf78863197c1c637004584e4d368cb086
-
-diff -r f0e0974bf788 config/debug/gdb.in
---- a/config/debug/gdb.in	Sat Nov 10 18:22:36 2012 -0800
-+++ b/config/debug/gdb.in	Sat Nov 10 18:22:39 2012 -0800
-@@ -41,6 +41,12 @@
-     select GDB_7_0_or_later
-     select GDB_7_2_or_later
- 
-+config GDB_V_7_5
-+    bool
-+    prompt "7.5 (EXPERIMENTAL)"
-+    select GDB_7_0_or_later
-+    select GDB_7_2_or_later
-+
- config GDB_V_linaro_7_4_2012_06
-     bool
-     prompt "linaro-7.4-2012.06 (EXPERIMENTAL)"
-@@ -147,6 +153,7 @@
- # Don't remove next line
- # CT_INSERT_VERSION_STRING_BELOW
-     default "linaro-7.5-2012.09" if GDB_V_linaro_7_5_2012_09
-+    default "7.5" if GDB_V_7_5
-     default "linaro-7.4-2012.06" if GDB_V_linaro_7_4_2012_06
-     default "7.4.1" if GDB_V_7_4_1
-     default "7.4" if GDB_V_7_4

glibc-2.15.diff

-# HG changeset patch
-# User Cody Schafer <jmesmon@gmail.com>
-# Date 1340916525 25200
-# Node ID c130666cbf166e2be70125049b94b1b982eaf7c1
-# Parent 6ae23b8a423d49dd3fc29eb4c868e40ec6bcf905
-add glibc 2.15 support.
-
-diff -r 6ae23b8a423d config/libc/glibc.in
---- a/config/libc/glibc.in	Thu Jun 28 11:57:46 2012 -0700
-+++ b/config/libc/glibc.in	Sat Nov 10 18:22:30 2012 -0800
-@@ -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
-binutils-2.23.diff
 multilib-fix.diff
 strace-4.7.diff
-glibc-2.15.diff
 binutils-2.22-similfy-config.diff
-gcc-4.7.3-add.diff
-gdb-7.5-add.diff
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.