summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-07-06 17:46:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:54:02 +0100
commiteb6323cc56a6940babbb054e13fce1ad830d2f23 (patch)
treefe2f32854b8378d159fd26532ea5fcbb0a5e768c /meta
parent4240bd68240d5d0a60719b4f85038a586b919ce6 (diff)
downloadpoky-eb6323cc56a6940babbb054e13fce1ad830d2f23.tar.gz
gcc: Switch to git SRC_URI
svn has been giving troubles with svn 1.7 upgrade Remove duplicate definition of S and B variables from gcc-4.7.inc Use 4.7.1.0 for PV to maintain the upgrade path Its an interim solution once we upgrade to 4.7.2 we will drop it. (From OE-Core rev: 3f3b74b3fd6ba813dd69804706edcea145876e09) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.7.inc11
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 35332b4c7e..ece32c1546 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -8,7 +8,10 @@ PR = "r6"
8# on branch then PV should be incremented to 4.7.2+svnr${SRCPV} 8# on branch then PV should be incremented to 4.7.2+svnr${SRCPV}
9# to reflect that change 9# to reflect that change
10 10
11PV = "4.7.1+svnr${SRCPV}" 11# using 4.7.1.0 for upgrade path when we move past 4.7.2 release
12# then we should drop the last 0 as well.
13
14PV = "4.7.1.0+git${SRCPV}"
12 15
13# BINV should be incremented after updating to a revision 16# BINV should be incremented after updating to a revision
14# after a minor gcc release (e.g. 4.7.1 or 4.7.2) has been made 17# after a minor gcc release (e.g. 4.7.1 or 4.7.2) has been made
@@ -18,7 +21,7 @@ PV = "4.7.1+svnr${SRCPV}"
18 21
19BINV = "4.7.2" 22BINV = "4.7.2"
20 23
21SRCREV = "188658" 24SRCREV = "d07e24f4ab59f264d68d21838795349faab5dede"
22BRANCH = "gcc-4_7-branch" 25BRANCH = "gcc-4_7-branch"
23FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.7' ], d)}" 26FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.7' ], d)}"
24 27
@@ -33,7 +36,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
33 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 36 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
34 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8" 37 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8"
35 38
36SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};protocol=http \ 39SRC_URI = "git://github.com/mirrors/gcc.git;branch=${BRANCH};protocol=git \
37 file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ 40 file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
38 file://100-uclibc-conf.patch \ 41 file://100-uclibc-conf.patch \
39 file://gcc-uclibc-locale-ctype_touplow_t.patch \ 42 file://gcc-uclibc-locale-ctype_touplow_t.patch \
@@ -74,7 +77,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};protocol=http \
74 file://fix-g++-sysroot.patch \ 77 file://fix-g++-sysroot.patch \
75 " 78 "
76 79
77S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${BRANCH}" 80S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/git"
78B = "${WORKDIR}/${BRANCH}/build.${HOST_SYS}.${TARGET_SYS}" 81B = "${WORKDIR}/${BRANCH}/build.${HOST_SYS}.${TARGET_SYS}"
79 82
80# Language Overrides 83# Language Overrides