1.1 --- a/config/cc/gcc.in Tue Oct 30 00:23:51 2012 +0100
1.2 +++ b/config/cc/gcc.in Tue Oct 30 00:30:47 2012 +0100
1.3 @@ -34,13 +34,6 @@
1.4 bool
1.5 prompt "gcc version"
1.6
1.7 -config CC_V_SVN
1.8 - bool
1.9 - prompt "gcc from svn"
1.10 - depends on EXPERIMENTAL
1.11 - depends on CONFIGURE_has_svn
1.12 - select CC_GCC_latest
1.13 -
1.14 # Don't remove next line
1.15 # CT_INSERT_VERSION_BELOW
1.16
1.17 @@ -247,62 +240,6 @@
1.18
1.19 endchoice
1.20
1.21 -if CC_V_SVN
1.22 -
1.23 -config GCC_BRANCH
1.24 - string
1.25 - prompt "Branch or tag to use"
1.26 - default "trunk"
1.27 - help
1.28 - Enter the branch of gcc to use. Default is trunk
1.29 -
1.30 - A few examples might be:
1.31 - * trunk
1.32 - * branches/gcc-4_7-branch
1.33 - * branches/gcc-4_4-branch
1.34 - * branches/gccgo
1.35 - * branches/google
1.36 - * tags/gcc_4_7_1_release
1.37 - * tags/microblaze-4.4.2
1.38 -
1.39 -config GCC_REVISION
1.40 - string
1.41 - prompt "Revision to use"
1.42 - default "HEAD"
1.43 - help
1.44 - Enter the revision of you want to use. Default is HEAD
1.45 -
1.46 - A revision argument can be one of:
1.47 - NUMBER revision number
1.48 - '{' DATE '}' revision at start of the date (*)
1.49 - 'HEAD' latest in repository
1.50 -
1.51 - (*) If you want to use a date, please use ISO-8601 formats if
1.52 - at all possible.
1.53 -
1.54 -config GCC_HTTP
1.55 - bool
1.56 - prompt "use http:// instead of svn://"
1.57 - help
1.58 - By default, when gcc is downloaded it is checked out using
1.59 - svn://gcc.gnu.org/svn/gcc. This option allows you to download gcc
1.60 - from http://gcc.gnu.org/svn/gcc, if you are behind a proxy or firewall.
1.61 - If you are behind a proxy, don't forget to update your
1.62 - .subversion/servers file with your proxy info in [global].
1.63 -
1.64 -config GCC_CHECKOUT
1.65 - bool
1.66 - prompt "checkout instead of export"
1.67 - help
1.68 - By default, the gcc download will be an export of the subversion
1.69 - repository. If you say 'y' here, then the repository will instead be
1.70 - checked-out, so that you can update it later.
1.71 -
1.72 - Note that crosstool-NG will *not* update your working copy, you will
1.73 - have to do that yourself.
1.74 -
1.75 -endif
1.76 -
1.77 if CC_CUSTOM
1.78
1.79 config CC_CUSTOM_LOCATION
1.80 @@ -461,7 +398,6 @@
1.81
1.82 config CC_VERSION
1.83 string
1.84 - default "SVN" if CC_V_SVN
1.85 # Don't remove next line
1.86 # CT_INSERT_VERSION_STRING_BELOW
1.87 default "linaro-4.7-2012.10" if CC_V_linaro_4_7_2012_10
2.1 --- a/scripts/build/cc/gcc.sh Tue Oct 30 00:23:51 2012 +0100
2.2 +++ b/scripts/build/cc/gcc.sh Tue Oct 30 00:30:47 2012 +0100
2.3 @@ -4,31 +4,13 @@
2.4
2.5 # Download gcc
2.6 do_cc_get() {
2.7 + local linaro_version
2.8 + local linaro_series
2.9 + local linaro_base_url="http://launchpad.net/gcc-linaro"
2.10 +
2.11 if [ "${CT_CC_CUSTOM}" = "y" ]; then
2.12 CT_GetCustom "gcc" "${CT_CC_VERSION}" "${CT_CC_CUSTOM_LOCATION}"
2.13 - elif [ -n "${CT_CC_V_SVN}" ]; then
2.14 - # Get gcc from SVN!
2.15 - local svn_base
2.16 -
2.17 - if [ "${CT_GCC_HTTP}" = "y" ]; then
2.18 - svn_base="http://gcc.gnu.org/svn/gcc"
2.19 - else
2.20 - svn_base="svn://gcc.gnu.org/svn/gcc"
2.21 - fi
2.22 -
2.23 - svn_base+="/${CT_GCC_BRANCH:-trunk}"
2.24 -
2.25 - CT_CC_VERSION="${CT_GCC_BRANCH//\//_}"
2.26 -
2.27 - CT_GetSVN "gcc-${CT_CC_VERSION}" \
2.28 - "${svn_base}/" \
2.29 - "${CT_GCC_REVISION:-HEAD}"
2.30 else
2.31 - local linaro_version
2.32 - local linaro_series
2.33 - local linaro_base_url="http://launchpad.net/gcc-linaro"
2.34 -
2.35 -
2.36 # Account for the Linaro versioning
2.37 linaro_version="$( echo "${CT_CC_VERSION}" \
2.38 |sed -r -e 's/^linaro-//;' \
2.39 @@ -48,7 +30,7 @@
2.40 ftp://ftp.uvsq.fr/pub/gcc/snapshots/${CT_CC_VERSION} \
2.41 "${linaro_base_url}/${linaro_series}/${linaro_version}/+download"
2.42
2.43 - fi # -n ${CT_CC_V_SVN}
2.44 + fi # ! custom location
2.45 # Starting with GCC 4.3, ecj is used for Java, and will only be
2.46 # built if the configure script finds ecj.jar at the top of the
2.47 # GCC source tree, which will not be there unless we get it and