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

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

5 files changed, 32 insertions, 31 deletions

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
index ffe6dce17d..1c0f893ca9 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
@@ -7,7 +7,7 @@ SRC_URI += "file://quotefix.patch;patch=1 \
 
 SRC_URI[md5sum] = "1b24a21fc0c2381ef420961cbfec733f"
 SRC_URI[sha256sum] = "9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20"
-#file://no-hardlinks.patch;patch=1 \
+#file://no-hardlinks.patch;patch=1
 
 PARALLEL_MAKE = ""
 
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"
 
diff --git a/meta/recipes-devtools/perl/perl_5.12.2.bb b/meta/recipes-devtools/perl/perl_5.12.2.bb
index ce9998601d..e659152d4b 100644
--- a/meta/recipes-devtools/perl/perl_5.12.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.12.2.bb
@@ -37,7 +37,6 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
         file://debian/enc2xs_inc.diff \
         file://debian/errno_ver.diff \
         file://debian/extutils_hacks.diff \
-#        file://debian/fakeroot.diff \
         file://debian/instmodsh_doc.diff \
         file://debian/ld_run_path.diff \
         file://debian/libnet_config_path.diff \
@@ -69,6 +68,7 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
         file://config.sh-64 \
         file://config.sh-64-le \
         file://config.sh-64-be"
+#        file://debian/fakeroot.diff
 
 SRC_URI[md5sum] = "af2df531d46b77fdf0d97eecb03eddb2"
 SRC_URI[sha256sum] = "cf888340021d5a2d1238bbd9b8b55aaf420a848d46e4d317cb8567f86ceb1022"
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index ac9df6fa82..8bce395483 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -186,12 +186,12 @@ FILES_${PN} = "${bindir}/rpm \
                 ${libdir}/rpm/bin/wget \
                 "
 
-#               ${libdir}/rpm/magic \
-#               ${libdir}/rpm/magic.mgc \
-#               ${libdir}/rpm/magic.mime \
-#               ${libdir}/rpm/magic.mime.mgc \
-#               ${libdir}/rpm/bin/db_* \
-#               ${libdir}/rpm/bin/grep \
+#               ${libdir}/rpm/magic
+#               ${libdir}/rpm/magic.mgc
+#               ${libdir}/rpm/magic.mime
+#               ${libdir}/rpm/magic.mime.mgc
+#               ${libdir}/rpm/bin/db_*
+#               ${libdir}/rpm/bin/grep
 
 FILES_${PN}-dbg = "${bindir}/.debug \
                 ${libdir}/.debug \