[oe-commits] org.oe.dev merge of 'd1405d37b57316e56826c15ad9770b0ae3e31f7d'

[oe commit]

merge of 'd1405d37b57316e56826c15ad9770b0ae3e31f7d'
     and 'd5059e99123ac26efa72358d1cdbbb2776399a25'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 4c14c9ed388ab8fccaa4c1f058c5d5c80c575aca
ViewMTN: http://monotone.openembedded.org/revision/info/4c14c9ed388ab8fccaa4c1f058c5d5c80c575aca
Files:
1
packages/gcc/gcc_4.1.0.bb
packages/gcc/gcc_4.1.1.bb
packages/gcc/gcc_4.2.1.bb
packages/gcc/gcc_4.2.2.bb
packages/mpfr/mpfr_cvs.bb
packages/mpfr/mpfr_svn.bb
packages/mpfr/mpfr-native_svn.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc_4.1.2.bb
Diffs:

#
# mt diff -rd1405d37b57316e56826c15ad9770b0ae3e31f7d -r4c14c9ed388ab8fccaa4c1f058c5d5c80c575aca
#
# 
# 
# patch "packages/gcc/gcc_4.1.0.bb"
#  from [c214142e3085b1c1c6c8f256fd775ae8a806e012]
#    to [f35337d98d662c86f98faa30e09d3a4a0c8e5422]
# 
# patch "packages/gcc/gcc_4.1.1.bb"
#  from [09774471cd8199b5b23384d71dc1a085e546499e]
#    to [7134e088d48fb7b045110619d8f83e6e71f809e4]
# 
# patch "packages/gcc/gcc_4.2.1.bb"
#  from [71acc245b0c9e7c137053c4b1f61cd2d5830d6d0]
#    to [bbd5cdf1af6cbc7657cac1beb5869b7583d63035]
# 
# patch "packages/gcc/gcc_4.2.2.bb"
#  from [34991f7744aeec6fcbf842874b7ce59dd802bae4]
#    to [9431e24ceb8ddbf95f188a082285df6221e06508]
# 
============================================================
--- packages/gcc/gcc_4.1.0.bb	c214142e3085b1c1c6c8f256fd775ae8a806e012
+++ packages/gcc/gcc_4.1.0.bb	f35337d98d662c86f98faa30e09d3a4a0c8e5422
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -13,7 +13,8 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gc
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
 	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://ldflags.patch;patch=1"
+	file://ldflags.patch;patch=1 \
+    file://pr34130.patch;patch=1"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
============================================================
--- packages/gcc/gcc_4.1.1.bb	09774471cd8199b5b23384d71dc1a085e546499e
+++ packages/gcc/gcc_4.1.1.bb	7134e088d48fb7b045110619d8f83e6e71f809e4
@@ -1,4 +1,4 @@
-PR = "r15"
+PR = "r16"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -34,6 +34,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gc
         file://gcc-4.1.1-pr13685-1.patch;patch=1 \
         file://gcc-ignore-cache.patch;patch=1 \
         file://gcc-4.1.1-e300cx.patch;patch=1 \
+        file://pr34130.patch;patch=1 \
 	"
 
 SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
============================================================
--- packages/gcc/gcc_4.2.1.bb	71acc245b0c9e7c137053c4b1f61cd2d5830d6d0
+++ packages/gcc/gcc_4.2.1.bb	bbd5cdf1af6cbc7657cac1beb5869b7583d63035
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -39,6 +39,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
         file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
 	file://cache-amnesia.patch;patch=1 \
         file://gfortran.patch;patch=1 \
+        file://pr34130.patch;patch=1 \
 "
 
 SRC_URI_append_ep93xx = " \
============================================================
--- packages/gcc/gcc_4.2.2.bb	34991f7744aeec6fcbf842874b7ce59dd802bae4
+++ packages/gcc/gcc_4.2.2.bb	9431e24ceb8ddbf95f188a082285df6221e06508
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -39,6 +39,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
         file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
 	file://cache-amnesia.patch;patch=1 \
         file://gfortran.patch;patch=1 \
+        file://pr34130.patch;patch=1 \
 "
 
 SRC_URI_append_ep93xx = " \


#
# mt diff -rd5059e99123ac26efa72358d1cdbbb2776399a25 -r4c14c9ed388ab8fccaa4c1f058c5d5c80c575aca
#
# 
# 
# rename "packages/mpfr/mpfr_cvs.bb"
#     to "packages/mpfr/mpfr_svn.bb"
# 
# add_file "packages/mpfr/mpfr-native_svn.bb"
#  content [8ff1cc81cccc445e359ee00d067e65bfa6263e3b]
# 
# patch "packages/gcc/gcc-cross_4.1.2.bb"
#  from [83f877f5f2ae3f14b9bf2a68b64d508fd1835087]
#    to [08a75f7777c10e0526242d4021330547bddfd7d3]
# 
# patch "packages/gcc/gcc_4.1.2.bb"
#  from [f83d37a6eb350627b87317b6e2b770377361267e]
#    to [68eac9378be7e37e7c220f6cc6c2e8e2918b3821]
# 
# patch "packages/mpfr/mpfr_svn.bb"
#  from [bdefc6ba2d77c86aa9ffc6b8097f3cb247631063]
#    to [bc40031a3b64de197388fcd8523b7442272a8873]
# 
============================================================
--- packages/mpfr/mpfr-native_svn.bb	8ff1cc81cccc445e359ee00d067e65bfa6263e3b
+++ packages/mpfr/mpfr-native_svn.bb	8ff1cc81cccc445e359ee00d067e65bfa6263e3b
@@ -0,0 +1,3 @@
+require mpfr_svn.bb
+inherit native
+DEPENDS = "gmp-native"
============================================================
--- packages/gcc/gcc-cross_4.1.2.bb	83f877f5f2ae3f14b9bf2a68b64d508fd1835087
+++ packages/gcc/gcc-cross_4.1.2.bb	08a75f7777c10e0526242d4021330547bddfd7d3
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .bb changes something that affects its *build*
 # remember to increment this one too.
-PR = "r11"
+PR = "r12"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc_4.1.2.bb	f83d37a6eb350627b87317b6e2b770377361267e
+++ packages/gcc/gcc_4.1.2.bb	68eac9378be7e37e7c220f6cc6c2e8e2918b3821
@@ -1,10 +1,10 @@ LICENSE = "GPL"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 # NOTE: split PR.  If the main .bb changes something that affects its *build*
 # remember to increment the -cross .bb PR too.
-PR = "r8"
+PR = "r9"
 
 inherit autotools gettext
 
============================================================
--- packages/mpfr/mpfr_cvs.bb	bdefc6ba2d77c86aa9ffc6b8097f3cb247631063
+++ packages/mpfr/mpfr_svn.bb	bc40031a3b64de197388fcd8523b7442272a8873
@@ -1,11 +1,11 @@ DEPENDS = "gmp"
 require mpfr.inc
 
 DEPENDS = "gmp"
-PV = "0.0+cvs${SRCDATE}"
-PR = "r2"
+PV = "0.0+svn${SRCDATE}"
+PR = "r3"
 
-SRC_URI = "cvs://cvs:@cvs-sop.inria.fr/CVS/spaces;module=mpfr;method=pserver"
-S = "${WORKDIR}/mpfr"
+SRC_URI = "svn://scm.gforge.inria.fr/svn/mpfr;module=trunk"
+S = "${WORKDIR}/trunk"
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \