Patchwork [4/4] gcc: replace unconditional SRC_URI_append with SRC_URI +=

login
register
mail settings
Submitter Andreas Oberritter
Date Jan. 6, 2011, 12:48 p.m.
Message ID <1294318110-23521-4-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/186/
State Accepted
Commit ee85c41bb8f694ea7c58cebefa358adfb29f9adc
Headers show

Comments

Andreas Oberritter - Jan. 6, 2011, 12:48 p.m.
* Fixes missing leading whitespace character at some locations

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
CC: Khem Raj <raj.khem@gmail.com>
---
 recipes/gcc/gcc-3.4.4.inc             |    2 +-
 recipes/gcc/gcc-3.4.6.inc             |    2 +-
 recipes/gcc/gcc-4.0.2.inc             |    2 +-
 recipes/gcc/gcc-canadian-sdk_4.2.4.bb |    2 +-
 recipes/gcc/gcc_4.2.2.bb              |    2 +-
 recipes/gcc/gcc_4.2.3.bb              |    2 +-
 recipes/gcc/gcc_4.2.4.bb              |    2 +-
 recipes/gcc/gcc_4.3.1.bb              |    2 +-
 recipes/gcc/gcc_4.3.2.bb              |    2 +-
 recipes/gcc/gcc_4.3.3.bb              |    2 +-
 recipes/gcc/gcc_4.3.4.bb              |    2 +-
 recipes/gcc/gcc_4.4.1.bb              |    2 +-
 recipes/gcc/gcc_4.4.2.bb              |    2 +-
 recipes/gcc/gcc_4.4.4.bb              |    2 +-
 recipes/gcc/gcc_4.5.bb                |    2 +-
 recipes/gcc/gcc_svn.bb                |    2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)
Khem Raj - Jan. 6, 2011, 10:40 p.m.
On Thu, Jan 6, 2011 at 4:48 AM, Andreas Oberritter <obi@opendreambox.org> wrote:
> * Fixes missing leading whitespace character at some locations
>
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> CC: Khem Raj <raj.khem@gmail.com>

for sanity can you make sure that these patches are being picked up?
by doing bitbake -c patch

Acked-by: Khem Raj <raj.khem@gmail.com>

> ---
>  recipes/gcc/gcc-3.4.4.inc             |    2 +-
>  recipes/gcc/gcc-3.4.6.inc             |    2 +-
>  recipes/gcc/gcc-4.0.2.inc             |    2 +-
>  recipes/gcc/gcc-canadian-sdk_4.2.4.bb |    2 +-
>  recipes/gcc/gcc_4.2.2.bb              |    2 +-
>  recipes/gcc/gcc_4.2.3.bb              |    2 +-
>  recipes/gcc/gcc_4.2.4.bb              |    2 +-
>  recipes/gcc/gcc_4.3.1.bb              |    2 +-
>  recipes/gcc/gcc_4.3.2.bb              |    2 +-
>  recipes/gcc/gcc_4.3.3.bb              |    2 +-
>  recipes/gcc/gcc_4.3.4.bb              |    2 +-
>  recipes/gcc/gcc_4.4.1.bb              |    2 +-
>  recipes/gcc/gcc_4.4.2.bb              |    2 +-
>  recipes/gcc/gcc_4.4.4.bb              |    2 +-
>  recipes/gcc/gcc_4.5.bb                |    2 +-
>  recipes/gcc/gcc_svn.bb                |    2 +-
>  16 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/recipes/gcc/gcc-3.4.4.inc b/recipes/gcc/gcc-3.4.4.inc
> index 99e680f..8a3ce02 100644
> --- a/recipes/gcc/gcc-3.4.4.inc
> +++ b/recipes/gcc/gcc-3.4.4.inc
> @@ -26,7 +26,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
>           file://gcc-cross-fixincl.patch \
>           file://gcc-posix-open-fix.patch \
>           "
> -SRC_URI_append = " file://zecke-no-host-includes.patch "
> +SRC_URI += "file://zecke-no-host-includes.patch"
>
>  SRC_URI[archive.md5sum] = "b594ff4ea4fbef4ba9220887de713dfe"
>  SRC_URI[archive.sha256sum] = "3444179840638cb8664e8e53604900c4521d29d57785a5091202ee4937d8d0fd"
> diff --git a/recipes/gcc/gcc-3.4.6.inc b/recipes/gcc/gcc-3.4.6.inc
> index 5296f26..3991cdc 100644
> --- a/recipes/gcc/gcc-3.4.6.inc
> +++ b/recipes/gcc/gcc-3.4.6.inc
> @@ -23,7 +23,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
>
>  SRC_URI += "file://gcc34-configure.in.patch"
>  SRC_URI += "file://gcc34-thumb-support.patch"
> -SRC_URI_append = " file://zecke-no-host-includes.patch "
> +SRC_URI += "file://zecke-no-host-includes.patch"
>
>  SRC_URI[archive.md5sum] = "4a21ac777d4b5617283ce488b808da7b"
>  SRC_URI[archive.sha256sum] = "7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39"
> diff --git a/recipes/gcc/gcc-4.0.2.inc b/recipes/gcc/gcc-4.0.2.inc
> index 63f9772..9d3c660 100644
> --- a/recipes/gcc/gcc-4.0.2.inc
> +++ b/recipes/gcc/gcc-4.0.2.inc
> @@ -13,7 +13,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
>        file://zecke-xgcc-cpp.patch "
>
>  # uclibc patches below
> -SRC_URI_append = " file://100-uclibc-conf.patch   \
> +SRC_URI += "file://100-uclibc-conf.patch   \
>                    file://200-uclibc-locale.patch \
>                    file://301-missing-execinfo_h.patch \
>                    file://302-c99-snprintf.patch  \
> diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
> index 7a1402f..08a4c95 100644
> --- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
> +++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
> @@ -14,7 +14,7 @@ DEPENDS = "gmp-canadian mpfr-canadian"
>  require gcc-configure-canadian-sdk.inc
>  require gcc-package-sdk.inc
>
> -SRC_URI_append = "file://fortran-cross-compile-hack.patch \
> +SRC_URI += "file://fortran-cross-compile-hack.patch \
>                  file://pr22133-mingw-path-fixup.patch \
>                  file://pr33281-mingw-host-fragment.patch \
>                  file://pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch \
> diff --git a/recipes/gcc/gcc_4.2.2.bb b/recipes/gcc/gcc_4.2.2.bb
> index 30713f8..4822da9 100644
> --- a/recipes/gcc/gcc_4.2.2.bb
> +++ b/recipes/gcc/gcc_4.2.2.bb
> @@ -4,6 +4,6 @@ require gcc-${PV}.inc
>  require gcc-configure-target.inc
>  require gcc-package-target.inc
>
> -SRC_URI_append = "file://fortran-cross-compile-hack.patch"
> +SRC_URI += "file://fortran-cross-compile-hack.patch"
>
>  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
> diff --git a/recipes/gcc/gcc_4.2.3.bb b/recipes/gcc/gcc_4.2.3.bb
> index 6fe3028..a174e11 100644
> --- a/recipes/gcc/gcc_4.2.3.bb
> +++ b/recipes/gcc/gcc_4.2.3.bb
> @@ -4,7 +4,7 @@ require gcc-${PV}.inc
>  require gcc-configure-target.inc
>  require gcc-package-target.inc
>
> -SRC_URI_append = "file://fortran-cross-compile-hack.patch"
> +SRC_URI += "file://fortran-cross-compile-hack.patch"
>
>  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
>
> diff --git a/recipes/gcc/gcc_4.2.4.bb b/recipes/gcc/gcc_4.2.4.bb
> index 6fe3028..a174e11 100644
> --- a/recipes/gcc/gcc_4.2.4.bb
> +++ b/recipes/gcc/gcc_4.2.4.bb
> @@ -4,7 +4,7 @@ require gcc-${PV}.inc
>  require gcc-configure-target.inc
>  require gcc-package-target.inc
>
> -SRC_URI_append = "file://fortran-cross-compile-hack.patch"
> +SRC_URI += "file://fortran-cross-compile-hack.patch"
>
>  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
>
> diff --git a/recipes/gcc/gcc_4.3.1.bb b/recipes/gcc/gcc_4.3.1.bb
> index 442c273..38ae714 100644
> --- a/recipes/gcc/gcc_4.3.1.bb
> +++ b/recipes/gcc/gcc_4.3.1.bb
> @@ -4,7 +4,7 @@ require gcc-${PV}.inc
>  require gcc-configure-target.inc
>  require gcc-package-target.inc
>
> -SRC_URI_append = "file://fortran-cross-compile-hack.patch"
> +SRC_URI += "file://fortran-cross-compile-hack.patch"
>
>  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
>
> diff --git a/recipes/gcc/gcc_4.3.2.bb b/recipes/gcc/gcc_4.3.2.bb
> index c73dfc1..998f58c 100644
> --- a/recipes/gcc/gcc_4.3.2.bb
> +++ b/recipes/gcc/gcc_4.3.2.bb
> @@ -8,6 +8,6 @@ FILES_${PN} += "\
>         ${gcclibdir}/${TARGET_SYS}/*/*.o \
>  "
>
> -SRC_URI_append = "file://fortran-cross-compile-hack.patch"
> +SRC_URI += "file://fortran-cross-compile-hack.patch"
>
>  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
> diff --git a/recipes/gcc/gcc_4.3.3.bb b/recipes/gcc/gcc_4.3.3.bb
> index 274f474..263969a 100644
> --- a/recipes/gcc/gcc_4.3.3.bb
> +++ b/recipes/gcc/gcc_4.3.3.bb
> @@ -8,7 +8,7 @@ FILES_${PN} += "\
>         ${gcclibdir}/${TARGET_SYS}/*/*.o \
>  "
>
> -SRC_URI_append = "file://fortran-cross-compile-hack.patch"
> +SRC_URI += "file://fortran-cross-compile-hack.patch"
>
>  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
>
> diff --git a/recipes/gcc/gcc_4.3.4.bb b/recipes/gcc/gcc_4.3.4.bb
> index ec20085..57ced16 100644
> --- a/recipes/gcc/gcc_4.3.4.bb
> +++ b/recipes/gcc/gcc_4.3.4.bb
> @@ -8,6 +8,6 @@ FILES_${PN} += "\
>         ${gcclibdir}/${TARGET_SYS}/*/*.o \
>  "
>
> -SRC_URI_append = "file://fortran-cross-compile-hack.patch"
> +SRC_URI += "file://fortran-cross-compile-hack.patch"
>
>  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
> diff --git a/recipes/gcc/gcc_4.4.1.bb b/recipes/gcc/gcc_4.4.1.bb
> index 52b09cf..30ab402 100644
> --- a/recipes/gcc/gcc_4.4.1.bb
> +++ b/recipes/gcc/gcc_4.4.1.bb
> @@ -8,7 +8,7 @@ FILES_${PN} += "\
>         ${gcclibdir}/${TARGET_SYS}/*/*.o \
>  "
>
> -SRC_URI_append = "file://fortran-cross-compile-hack.patch"
> +SRC_URI += "file://fortran-cross-compile-hack.patch"
>
>  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
>
> diff --git a/recipes/gcc/gcc_4.4.2.bb b/recipes/gcc/gcc_4.4.2.bb
> index d1d50ad..55f05b5 100644
> --- a/recipes/gcc/gcc_4.4.2.bb
> +++ b/recipes/gcc/gcc_4.4.2.bb
> @@ -8,7 +8,7 @@ FILES_${PN} += "\
>         ${gcclibdir}/${TARGET_SYS}/*/*.o \
>  "
>
> -SRC_URI_append = "file://fortran-cross-compile-hack.patch"
> +SRC_URI += "file://fortran-cross-compile-hack.patch"
>
>  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
>
> diff --git a/recipes/gcc/gcc_4.4.4.bb b/recipes/gcc/gcc_4.4.4.bb
> index 271e9d1..6aeac2f 100644
> --- a/recipes/gcc/gcc_4.4.4.bb
> +++ b/recipes/gcc/gcc_4.4.4.bb
> @@ -8,6 +8,6 @@ FILES_${PN} += "\
>         ${gcclibdir}/${TARGET_SYS}/*/*.o \
>  "
>
> -SRC_URI_append = "file://fortran-cross-compile-hack.patch"
> +SRC_URI += "file://fortran-cross-compile-hack.patch"
>
>  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
> diff --git a/recipes/gcc/gcc_4.5.bb b/recipes/gcc/gcc_4.5.bb
> index ad71ada..bc59b14 100644
> --- a/recipes/gcc/gcc_4.5.bb
> +++ b/recipes/gcc/gcc_4.5.bb
> @@ -10,6 +10,6 @@ FILES_${PN} += "\
>        ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto-wrapper \
>  "
>
> -SRC_URI_append = "file://fortran-cross-compile-hack.patch"
> +SRC_URI += "file://fortran-cross-compile-hack.patch"
>
>  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
> diff --git a/recipes/gcc/gcc_svn.bb b/recipes/gcc/gcc_svn.bb
> index 9b69a23..0332174 100644
> --- a/recipes/gcc/gcc_svn.bb
> +++ b/recipes/gcc/gcc_svn.bb
> @@ -8,6 +8,6 @@ FILES_${PN} += "\
>         ${gcclibdir}/${TARGET_SYS}/*/*.o \
>  "
>
> -SRC_URI_append = "file://fortran-cross-compile-hack.patch"
> +SRC_URI += "file://fortran-cross-compile-hack.patch"
>
>  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
> --
> 1.7.2.3
>
>
Paul Menzel - Jan. 7, 2011, 9:52 a.m.
Am Donnerstag, den 06.01.2011, 12:48 +0000 schrieb Andreas Oberritter:

What do you mean by »unconditional SRC_URI_append«? I searched through
the documentation and could not find the word. I always thought
`SRC_URI_append =` and `SRC_URI +=` is the same and if I am not mistaken
the manual says the same [1].

Do I understand your patch correctly, that when `_append` was used in
the recipe in some places, the space was missing and that you chose to
replace it by `+=` for consistency?

[…]


Thanks and sorry for the stupid question.

Paul


[1] http://docs.openembedded.org/usermanual/usermanual.html#recipes_syntax
Koen Kooi - Jan. 7, 2011, 12:02 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 07-01-11 10:52, Paul Menzel wrote:
> Am Donnerstag, den 06.01.2011, 12:48 +0000 schrieb Andreas Oberritter:
> 
> What do you mean by »unconditional SRC_URI_append«? I searched through
> the documentation and could not find the word. I always thought
> `SRC_URI_append =` and `SRC_URI +=` is the same and if I am not mistaken
> the manual says the same [1].

SRC_URI_append = " foo" and SRC_URI += "foo" are the same, but
SRC_URI_append = "foo" and SRC_URI += "foo" are not the same. += (and
=+) add a space, append and prepend don't.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNJwDkMkyGM64RGpERAoTVAJ9zBNMKA8T/IkGZ6hjKh6ZkdqdeKQCglerY
o4hwnqyAwDWlTkekiNmagM4=
=PtUI
-----END PGP SIGNATURE-----
Andreas Oberritter - Jan. 7, 2011, 12:39 p.m.
On 01/07/2011 10:52 AM, Paul Menzel wrote:
> Am Donnerstag, den 06.01.2011, 12:48 +0000 schrieb Andreas Oberritter:
> 
> What do you mean by »unconditional SRC_URI_append«? I searched through
> the documentation and could not find the word.

Unconditional, because it doesn't contain an override like e.g.
SRC_URI_append_beagleboard does.

> I always thought
> `SRC_URI_append =` and `SRC_URI +=` is the same and if I am not mistaken
> the manual says the same [1].
> 
> Do I understand your patch correctly, that when `_append` was used in
> the recipe in some places, the space was missing and that you chose to
> replace it by `+=` for consistency?

Yes. I think that += is easier to use and less error-prone.

- As Koen already pointed out, it adds whitespace automatically, so in
whitespace separated lists like SRC_URI you don't have to care.

- You can use multiple statements in a recipe.

SRC_URI += "foo"
SRC_URI += "bar"

vs.

SRC_URI_append = " foo"
SRC_URI_append = " bar"

The latter wouldn't work.

In the case of gcc, I modified SRC_URI in some inc file resulting in
"... file://my.patchfile://fortran-cross-compile-hack.patch ...".

> [1] http://docs.openembedded.org/usermanual/usermanual.html#recipes_syntax

SRC_URI_append = "file://fixup.patch" is probably a bad example.

Regards,
Andreas

Patch

diff --git a/recipes/gcc/gcc-3.4.4.inc b/recipes/gcc/gcc-3.4.4.inc
index 99e680f..8a3ce02 100644
--- a/recipes/gcc/gcc-3.4.4.inc
+++ b/recipes/gcc/gcc-3.4.4.inc
@@ -26,7 +26,7 @@  SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
 	   file://gcc-cross-fixincl.patch \
 	   file://gcc-posix-open-fix.patch \
 	   "
-SRC_URI_append = " file://zecke-no-host-includes.patch "
+SRC_URI += "file://zecke-no-host-includes.patch"
 
 SRC_URI[archive.md5sum] = "b594ff4ea4fbef4ba9220887de713dfe"
 SRC_URI[archive.sha256sum] = "3444179840638cb8664e8e53604900c4521d29d57785a5091202ee4937d8d0fd"
diff --git a/recipes/gcc/gcc-3.4.6.inc b/recipes/gcc/gcc-3.4.6.inc
index 5296f26..3991cdc 100644
--- a/recipes/gcc/gcc-3.4.6.inc
+++ b/recipes/gcc/gcc-3.4.6.inc
@@ -23,7 +23,7 @@  SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
 
 SRC_URI += "file://gcc34-configure.in.patch"
 SRC_URI += "file://gcc34-thumb-support.patch"
-SRC_URI_append = " file://zecke-no-host-includes.patch "
+SRC_URI += "file://zecke-no-host-includes.patch"
 
 SRC_URI[archive.md5sum] = "4a21ac777d4b5617283ce488b808da7b"
 SRC_URI[archive.sha256sum] = "7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39"
diff --git a/recipes/gcc/gcc-4.0.2.inc b/recipes/gcc/gcc-4.0.2.inc
index 63f9772..9d3c660 100644
--- a/recipes/gcc/gcc-4.0.2.inc
+++ b/recipes/gcc/gcc-4.0.2.inc
@@ -13,7 +13,7 @@  SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
 	file://zecke-xgcc-cpp.patch "
 
 # uclibc patches below
-SRC_URI_append = " file://100-uclibc-conf.patch   \
+SRC_URI += "file://100-uclibc-conf.patch   \
                    file://200-uclibc-locale.patch \
                    file://301-missing-execinfo_h.patch \
                    file://302-c99-snprintf.patch  \
diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
index 7a1402f..08a4c95 100644
--- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
+++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
@@ -14,7 +14,7 @@  DEPENDS = "gmp-canadian mpfr-canadian"
 require gcc-configure-canadian-sdk.inc
 require gcc-package-sdk.inc
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch \
+SRC_URI += "file://fortran-cross-compile-hack.patch \
 		  file://pr22133-mingw-path-fixup.patch \
 		  file://pr33281-mingw-host-fragment.patch \
 		  file://pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch \
diff --git a/recipes/gcc/gcc_4.2.2.bb b/recipes/gcc/gcc_4.2.2.bb
index 30713f8..4822da9 100644
--- a/recipes/gcc/gcc_4.2.2.bb
+++ b/recipes/gcc/gcc_4.2.2.bb
@@ -4,6 +4,6 @@  require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch"
+SRC_URI += "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
diff --git a/recipes/gcc/gcc_4.2.3.bb b/recipes/gcc/gcc_4.2.3.bb
index 6fe3028..a174e11 100644
--- a/recipes/gcc/gcc_4.2.3.bb
+++ b/recipes/gcc/gcc_4.2.3.bb
@@ -4,7 +4,7 @@  require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch"
+SRC_URI += "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/recipes/gcc/gcc_4.2.4.bb b/recipes/gcc/gcc_4.2.4.bb
index 6fe3028..a174e11 100644
--- a/recipes/gcc/gcc_4.2.4.bb
+++ b/recipes/gcc/gcc_4.2.4.bb
@@ -4,7 +4,7 @@  require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch"
+SRC_URI += "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/recipes/gcc/gcc_4.3.1.bb b/recipes/gcc/gcc_4.3.1.bb
index 442c273..38ae714 100644
--- a/recipes/gcc/gcc_4.3.1.bb
+++ b/recipes/gcc/gcc_4.3.1.bb
@@ -4,7 +4,7 @@  require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch"
+SRC_URI += "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/recipes/gcc/gcc_4.3.2.bb b/recipes/gcc/gcc_4.3.2.bb
index c73dfc1..998f58c 100644
--- a/recipes/gcc/gcc_4.3.2.bb
+++ b/recipes/gcc/gcc_4.3.2.bb
@@ -8,6 +8,6 @@  FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch"
+SRC_URI += "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
diff --git a/recipes/gcc/gcc_4.3.3.bb b/recipes/gcc/gcc_4.3.3.bb
index 274f474..263969a 100644
--- a/recipes/gcc/gcc_4.3.3.bb
+++ b/recipes/gcc/gcc_4.3.3.bb
@@ -8,7 +8,7 @@  FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch"
+SRC_URI += "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/recipes/gcc/gcc_4.3.4.bb b/recipes/gcc/gcc_4.3.4.bb
index ec20085..57ced16 100644
--- a/recipes/gcc/gcc_4.3.4.bb
+++ b/recipes/gcc/gcc_4.3.4.bb
@@ -8,6 +8,6 @@  FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch"
+SRC_URI += "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
diff --git a/recipes/gcc/gcc_4.4.1.bb b/recipes/gcc/gcc_4.4.1.bb
index 52b09cf..30ab402 100644
--- a/recipes/gcc/gcc_4.4.1.bb
+++ b/recipes/gcc/gcc_4.4.1.bb
@@ -8,7 +8,7 @@  FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch"
+SRC_URI += "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/recipes/gcc/gcc_4.4.2.bb b/recipes/gcc/gcc_4.4.2.bb
index d1d50ad..55f05b5 100644
--- a/recipes/gcc/gcc_4.4.2.bb
+++ b/recipes/gcc/gcc_4.4.2.bb
@@ -8,7 +8,7 @@  FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch"
+SRC_URI += "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/recipes/gcc/gcc_4.4.4.bb b/recipes/gcc/gcc_4.4.4.bb
index 271e9d1..6aeac2f 100644
--- a/recipes/gcc/gcc_4.4.4.bb
+++ b/recipes/gcc/gcc_4.4.4.bb
@@ -8,6 +8,6 @@  FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch"
+SRC_URI += "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
diff --git a/recipes/gcc/gcc_4.5.bb b/recipes/gcc/gcc_4.5.bb
index ad71ada..bc59b14 100644
--- a/recipes/gcc/gcc_4.5.bb
+++ b/recipes/gcc/gcc_4.5.bb
@@ -10,6 +10,6 @@  FILES_${PN} += "\
 	${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto-wrapper \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch"
+SRC_URI += "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
diff --git a/recipes/gcc/gcc_svn.bb b/recipes/gcc/gcc_svn.bb
index 9b69a23..0332174 100644
--- a/recipes/gcc/gcc_svn.bb
+++ b/recipes/gcc/gcc_svn.bb
@@ -8,6 +8,6 @@  FILES_${PN} += "\
         ${gcclibdir}/${TARGET_SYS}/*/*.o \
 "
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch"
+SRC_URI += "file://fortran-cross-compile-hack.patch"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"