Remove all comments from multiline expressions (as mentioned in bug #704)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 24 insertions, 23 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3.inc b/meta/recipes-devtools/gcc/gcc-4.3.3.inc
index 9b600a0f1f..55d66f5664 100644
--- a/meta/recipes-devtools/gcc/gcc-4.3.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3.inc
@@ -43,10 +43,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
         file://arm-nolibfloat.patch;patch=1 \
         file://arm-softfloat.patch;patch=1 \
         file://cache-amnesia.patch;patch=1 \
-#       file://gfortran.patch;patch=1 \
         file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-#       file://pr34130.patch;patch=1 \
-#       file://fortran-static-linking.patch;patch=1 \
         file://gcc-arm-frename-registers.patch;patch=1 \
         file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
         file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
@@ -58,6 +55,11 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
         file://64bithack.patch;patch=1 \
 "
 
+#       file://gfortran.patch;patch=1
+#       file://pr34130.patch;patch=1
+#       file://fortran-static-linking.patch;patch=1
+
+
 SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
 
 # Language Overrides
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc b/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
index e84bd835d2..cb5b087286 100644
--- a/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
@@ -6,31 +6,30 @@ PV = "4.2.3+csl-arm-2008q1-126"
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2008q1-126-arm-none-eabi.src.tar.bz2 \
-#           file://100-uclibc-conf.patch;patch=1 \
-#           file://103-uclibc-conf-noupstream.patch;patch=1 \
-#           file://200-uclibc-locale.patch;patch=1 \
-#           file://203-uclibc-locale-no__x.patch;patch=1 \
-#           file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-#           file://205-uclibc-locale-update.patch;patch=1 \
-#           file://300-libstdc++-pic.patch;patch=1 \
-#           file://302-c99-snprintf.patch;patch=1 \
-#           file://303-c99-complex-ugly-hack.patch;patch=1 \
-#           file://304-index_macro.patch;patch=1 \
-#           file://305-libmudflap-susv3-legacy.patch;patch=1 \
-#           file://306-libstdc++-namespace.patch;patch=1 \
-#           file://307-locale_facets.patch;patch=1 \
-#           file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-#           file://602-sdk-libstdc++-includes.patch;patch=1 \
            file://gcc41-configure.in.patch;patch=1 \
            file://arm-nolibfloat.patch;patch=1 \
            file://arm-softfloat.patch;patch=1 \
            file://zecke-xgcc-cpp.patch;patch=1 \
-#           file://gfortran.patch;patch=1 \
-#           file://fortran-static-linking.patch;patch=1 \
-#           file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
-#           file://gcc-new-makeinfo.patch;patch=1 \
 "
-
+#           file://100-uclibc-conf.patch;patch=1
+#           file://103-uclibc-conf-noupstream.patch;patch=1
+#           file://200-uclibc-locale.patch;patch=1
+#           file://203-uclibc-locale-no__x.patch;patch=1
+#           file://204-uclibc-locale-wchar_fix.patch;patch=1
+#           file://205-uclibc-locale-update.patch;patch=1
+#           file://300-libstdc++-pic.patch;patch=1
+#           file://302-c99-snprintf.patch;patch=1
+#           file://303-c99-complex-ugly-hack.patch;patch=1
+#           file://304-index_macro.patch;patch=1
+#           file://305-libmudflap-susv3-legacy.patch;patch=1
+#           file://306-libstdc++-namespace.patch;patch=1
+#           file://307-locale_facets.patch;patch=1
+#           file://402-libbackend_dep_gcov-iov.h.patch;patch=1
+#           file://602-sdk-libstdc++-includes.patch;patch=1
+#           file://gfortran.patch;patch=1
+#           file://fortran-static-linking.patch;patch=1
+#           file://gcc-configure-no-fortran.patch;patch=1;pnum=1
+#           file://gcc-new-makeinfo.patch;patch=1
 
 S = "${WORKDIR}/gcc-4.2"