From b9b75e6cf31991c046713194f75bc61027558464 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 14 Jun 2012 10:21:07 +0800 Subject: gcc-cross: argument list too long when do_install There would be an "Argument list too long" error when the length of tmpdir is longer than 190, this is caused by: headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u` The PLUGIN_HEADERS is too long before sort, so the "echo" can't handle it, use the $(sort list) of GNU make which can handle the too long list would fix the problem, the header would be short enough after sorted. The "tr ' ' '\012'" was used for translating the space to "\n", the $(sort list) doesn't need this. This doesn't impact the output, so it doesn't need the PR bump. [YOCTO #2591] Signed-off-by: Robert Yang --- meta/recipes-devtools/gcc/gcc-4.6.inc | 1 + .../gcc/gcc-4.6/gcc-argument-list-too-long.patch | 33 ++++++++++++++++++++++ meta/recipes-devtools/gcc/gcc-4.7.inc | 1 + .../gcc/gcc-4.7/gcc-argument-list-too-long.patch | 33 ++++++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-argument-list-too-long.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.7/gcc-argument-list-too-long.patch (limited to 'meta') diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc index 7a70a3848a..03d887149d 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6.inc +++ b/meta/recipes-devtools/gcc/gcc-4.6.inc @@ -75,6 +75,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \ file://fortran-cross-compile-hack.patch \ file://cpp-honour-sysroot.patch \ file://mips64-default-n64.patch \ + file://gcc-argument-list-too-long.patch \ " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch " diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-argument-list-too-long.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-argument-list-too-long.patch new file mode 100644 index 0000000000..70d3c53a84 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.6/gcc-argument-list-too-long.patch @@ -0,0 +1,33 @@ +There would be an "Argument list too long" error when the +build directory is longer than 200, this is caused by: + +headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u` + +The PLUGIN_HEADERS is too long before sort, so the "echo" can't handle +it, use the $(sort list) of GNU make which can handle the too long list +would fix the problem, the header would be short enough after sorted. +The "tr ' ' '\012'" was used for translating the space to "\n", the +$(sort list) doesn't need this. + +Signed-off-by: Robert Yang + +Upstream-Status: Pending +--- + gcc/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -4553,7 +4553,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype + # We keep the directory structure for files in config or c-family and .def + # files. All other files are flattened to a single directory. + $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) +- headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u`; \ ++ headers="$(sort $(PLUGIN_HEADERS))"; \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \ + for file in $$headers; do \ + if [ -f $$file ] ; then \ +-- +1.7.10.2 + diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc index 973c211fdb..34a73b1731 100644 --- a/meta/recipes-devtools/gcc/gcc-4.7.inc +++ b/meta/recipes-devtools/gcc/gcc-4.7.inc @@ -66,6 +66,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \ file://cpp-honor-sysroot.patch \ file://mips64-default-n64.patch \ file://arm-hard-float-loader.patch \ + file://gcc-argument-list-too-long.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${BRANCH}" diff --git a/meta/recipes-devtools/gcc/gcc-4.7/gcc-argument-list-too-long.patch b/meta/recipes-devtools/gcc/gcc-4.7/gcc-argument-list-too-long.patch new file mode 100644 index 0000000000..70d3c53a84 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.7/gcc-argument-list-too-long.patch @@ -0,0 +1,33 @@ +There would be an "Argument list too long" error when the +build directory is longer than 200, this is caused by: + +headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u` + +The PLUGIN_HEADERS is too long before sort, so the "echo" can't handle +it, use the $(sort list) of GNU make which can handle the too long list +would fix the problem, the header would be short enough after sorted. +The "tr ' ' '\012'" was used for translating the space to "\n", the +$(sort list) doesn't need this. + +Signed-off-by: Robert Yang + +Upstream-Status: Pending +--- + gcc/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -4553,7 +4553,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype + # We keep the directory structure for files in config or c-family and .def + # files. All other files are flattened to a single directory. + $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) +- headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u`; \ ++ headers="$(sort $(PLUGIN_HEADERS))"; \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \ + for file in $$headers; do \ + if [ -f $$file ] ; then \ +-- +1.7.10.2 + -- cgit 1.2.3-korg