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 069a96501298d53a7161b862381a1e01a36d84d5..85d108d9fbff67c3810f8b330754c6d3f7bdd473 100644 (file)
--- 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 069a96501298d53a7161b862381a1e01a36d84d5..85d108d9fbff67c3810f8b330754c6d3f7bdd473 100644 (file)
--- 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 6afb10d6efd21e718ec1a6a98d677695809bf8b3..8b05cb73a98a2a333abd952c502b5aa1004786c4 100644 (file)
--- 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 6afb10d6efd21e718ec1a6a98d677695809bf8b3..8b05cb73a98a2a333abd952c502b5aa1004786c4 100644 (file)
--- 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 6afb10d6efd21e718ec1a6a98d677695809bf8b3..8b05cb73a98a2a333abd952c502b5aa1004786c4 100644 (file)
--- 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 6afb10d6efd21e718ec1a6a98d677695809bf8b3..8b05cb73a98a2a333abd952c502b5aa1004786c4 100644 (file)
--- 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 6afb10d6efd21e718ec1a6a98d677695809bf8b3..8b05cb73a98a2a333abd952c502b5aa1004786c4 100644 (file)
--- 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();
 +               }
 +      }