From: Richard Purdie <richard@openedhand.com>
Date: Thu, 9 Oct 2008 23:04:13 +0000 (+0000)
Subject: gcc: Improve the build containment failure error message to be more user friendly
X-Git-Tag: 2011-1~8049
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3860decab26d0b0a839734f2bd882c5b857431ea;p=openembedded-core.git

gcc: Improve the build containment failure error message to be more user friendly

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5474 311d38ba-8fff-0310-9ca6-ca027cbcb966
---

diff --git a/meta/packages/gcc/gcc-3.4.4/zecke-no-host-includes.patch b/meta/packages/gcc/gcc-3.4.4/zecke-no-host-includes.patch
index 069a965012..85d108d9fb 100644
--- a/meta/packages/gcc/gcc-3.4.4/zecke-no-host-includes.patch
+++ b/meta/packages/gcc/gcc-3.4.4/zecke-no-host-includes.patch
@@ -16,13 +16,13 @@ Index: gcc-3.4.4/gcc/c-incpath.c
 +	{
 +		/* printf("Adding Path: %s\n", p->name ); */
 +		if( strstr(p->name, "/usr/include" ) == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /usr/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/sw/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /sw/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/opt/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /opt/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		}
 +	}
diff --git a/meta/packages/gcc/gcc-3.4.6/zecke-no-host-includes.patch b/meta/packages/gcc/gcc-3.4.6/zecke-no-host-includes.patch
index 069a965012..85d108d9fb 100644
--- a/meta/packages/gcc/gcc-3.4.6/zecke-no-host-includes.patch
+++ b/meta/packages/gcc/gcc-3.4.6/zecke-no-host-includes.patch
@@ -16,13 +16,13 @@ Index: gcc-3.4.4/gcc/c-incpath.c
 +	{
 +		/* printf("Adding Path: %s\n", p->name ); */
 +		if( strstr(p->name, "/usr/include" ) == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /usr/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/sw/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /sw/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/opt/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /opt/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		}
 +	}
diff --git a/meta/packages/gcc/gcc-4.1.2/zecke-no-host-includes.patch b/meta/packages/gcc/gcc-4.1.2/zecke-no-host-includes.patch
index 6afb10d6ef..8b05cb73a9 100644
--- a/meta/packages/gcc/gcc-4.1.2/zecke-no-host-includes.patch
+++ b/meta/packages/gcc/gcc-4.1.2/zecke-no-host-includes.patch
@@ -14,13 +14,13 @@ Index: gcc-4.0.2/gcc/c-incpath.c
 +	{
 +		/* printf("Adding Path: %s\n", p->name ); */
 +		if( strstr(p->name, "/usr/include" ) == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /usr/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/sw/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /sw/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/opt/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /opt/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		 }
 +	}
diff --git a/meta/packages/gcc/gcc-4.2.3/zecke-no-host-includes.patch b/meta/packages/gcc/gcc-4.2.3/zecke-no-host-includes.patch
index 6afb10d6ef..8b05cb73a9 100644
--- a/meta/packages/gcc/gcc-4.2.3/zecke-no-host-includes.patch
+++ b/meta/packages/gcc/gcc-4.2.3/zecke-no-host-includes.patch
@@ -14,13 +14,13 @@ Index: gcc-4.0.2/gcc/c-incpath.c
 +	{
 +		/* printf("Adding Path: %s\n", p->name ); */
 +		if( strstr(p->name, "/usr/include" ) == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /usr/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/sw/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /sw/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/opt/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /opt/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		 }
 +	}
diff --git a/meta/packages/gcc/gcc-4.3.1/zecke-no-host-includes.patch b/meta/packages/gcc/gcc-4.3.1/zecke-no-host-includes.patch
index 6afb10d6ef..8b05cb73a9 100644
--- a/meta/packages/gcc/gcc-4.3.1/zecke-no-host-includes.patch
+++ b/meta/packages/gcc/gcc-4.3.1/zecke-no-host-includes.patch
@@ -14,13 +14,13 @@ Index: gcc-4.0.2/gcc/c-incpath.c
 +	{
 +		/* printf("Adding Path: %s\n", p->name ); */
 +		if( strstr(p->name, "/usr/include" ) == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /usr/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/sw/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /sw/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/opt/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /opt/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		 }
 +	}
diff --git a/meta/packages/gcc/gcc-4.3.2/zecke-no-host-includes.patch b/meta/packages/gcc/gcc-4.3.2/zecke-no-host-includes.patch
index 6afb10d6ef..8b05cb73a9 100644
--- a/meta/packages/gcc/gcc-4.3.2/zecke-no-host-includes.patch
+++ b/meta/packages/gcc/gcc-4.3.2/zecke-no-host-includes.patch
@@ -14,13 +14,13 @@ Index: gcc-4.0.2/gcc/c-incpath.c
 +	{
 +		/* printf("Adding Path: %s\n", p->name ); */
 +		if( strstr(p->name, "/usr/include" ) == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /usr/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/sw/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /sw/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/opt/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /opt/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		 }
 +	}
diff --git a/meta/packages/gcc/gcc-csl-arm/zecke-no-host-includes.patch b/meta/packages/gcc/gcc-csl-arm/zecke-no-host-includes.patch
index 6afb10d6ef..8b05cb73a9 100644
--- a/meta/packages/gcc/gcc-csl-arm/zecke-no-host-includes.patch
+++ b/meta/packages/gcc/gcc-csl-arm/zecke-no-host-includes.patch
@@ -14,13 +14,13 @@ Index: gcc-4.0.2/gcc/c-incpath.c
 +	{
 +		/* printf("Adding Path: %s\n", p->name ); */
 +		if( strstr(p->name, "/usr/include" ) == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /usr/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/sw/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /sw/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		} else if( strstr(p->name, "/opt/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			fprintf(stderr, _("BUILD ISOLATION FAILURE: /opt/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
 +			abort();
 +		 }
 +	}