diff options
| author | Khem Raj <raj.khem@gmail.com> | 2012-07-06 17:46:29 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-17 10:43:14 +0100 |
| commit | 3f3b74b3fd6ba813dd69804706edcea145876e09 (patch) | |
| tree | 9c295d4bd05c327c641683a5d6d6871cfdc71547 /meta | |
| parent | 72cc3df204c4b838cc0358a7ac989adfdd5c1760 (diff) | |
| download | openembedded-core-3f3b74b3fd6ba813dd69804706edcea145876e09.tar.gz openembedded-core-3f3b74b3fd6ba813dd69804706edcea145876e09.tar.bz2 openembedded-core-3f3b74b3fd6ba813dd69804706edcea145876e09.zip | |
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.
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.inc | 11 |
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" # on branch then PV should be incremented to 4.7.2+svnr${SRCPV} # to reflect that change -PV = "4.7.1+svnr${SRCPV}" +# using 4.7.1.0 for upgrade path when we move past 4.7.2 release +# then we should drop the last 0 as well. + +PV = "4.7.1.0+git${SRCPV}" # BINV should be incremented after updating to a revision # 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}" BINV = "4.7.2" -SRCREV = "188658" +SRCREV = "d07e24f4ab59f264d68d21838795349faab5dede" BRANCH = "gcc-4_7-branch" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.7' ], d)}" @@ -33,7 +36,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8" -SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};protocol=http \ +SRC_URI = "git://github.com/mirrors/gcc.git;branch=${BRANCH};protocol=git \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ file://100-uclibc-conf.patch \ 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 \ file://fix-g++-sysroot.patch \ " -S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${BRANCH}" +S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/git" B = "${WORKDIR}/${BRANCH}/build.${HOST_SYS}.${TARGET_SYS}" # Language Overrides |