[oe-commits] Tom Rini : gcc-canadian-sdk: Add 4.2.3, and bring in 3 backport fixes from upstream.

[GIT User account]

Module: openembedded.git
Branch: trini/canadian-sdk
Commit: 4f7880a9874945e5f7ac90270156600678681087
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4f7880a9874945e5f7ac90270156600678681087

Author: Tom Rini <trini at embeddedalley.com>
Date:   Mon Dec 29 17:01:12 2008 -0500

gcc-canadian-sdk: Add 4.2.3, and bring in 3 backport fixes from upstream.

---

 .../canadian-build-modules-configure.patch         |    0 
 packages/gcc/files/pr22133-mingw-path-fixup.patch  |   29 ++++++++++++++++++++
 .../gcc/files/pr33281-mingw-host-fragment.patch    |   25 +++++++++++++++++
 ...35916-mingw-__USE_MINGW_ACCESS-everywhere.patch |   13 +++++++++
 packages/gcc/gcc-canadian-sdk_4.2.2.bb             |    3 +-
 packages/gcc/gcc-canadian-sdk_4.2.3.bb             |   29 ++++++++++++++++++++
 6 files changed, 98 insertions(+), 1 deletions(-)

diff --git a/packages/gcc/gcc-4.2.2/canadian-build-modules-configure.patch b/packages/gcc/files/canadian-build-modules-configure.patch
similarity index 100%
rename from packages/gcc/gcc-4.2.2/canadian-build-modules-configure.patch
rename to packages/gcc/files/canadian-build-modules-configure.patch
diff --git a/packages/gcc/files/pr22133-mingw-path-fixup.patch b/packages/gcc/files/pr22133-mingw-path-fixup.patch
new file mode 100644
index 0000000..429e9ff
--- /dev/null
+++ b/packages/gcc/files/pr22133-mingw-path-fixup.patch
@@ -0,0 +1,29 @@
+diff -rupN gcc-4.2.orig/gcc/c-incpath.c gcc-4.2/gcc/c-incpath.c
+--- gcc-4.2.orig/gcc/c-incpath.c	2007-09-01 11:28:30.000000000 -0400
++++ gcc-4.2/gcc/c-incpath.c	2008-08-17 16:56:01.000000000 -0400
+@@ -340,13 +340,18 @@ add_path (char *path, int chain, int cxx
+   cpp_dir *p;
+ 
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-  /* Convert all backslashes to slashes.  The native CRT stat()
+-     function does not recognize a directory that ends in a backslash
+-     (unless it is a drive root dir, such "c:\").  Forward slashes,
+-     trailing or otherwise, cause no problems for stat().  */
+-  char* c;
+-  for (c = path; *c; c++)
+-    if (*c == '\\') *c = '/';
++  /* Remove unnecessary trailing slashes.  On some versions of MS
++     Windows, trailing  _forward_ slashes cause no problems for stat().
++     On newer versions, stat() does not recognise a directory that ends
++     in a '\\' or '/', unless it is a drive root dir, such as "c:/",
++     where it is obligatory.  */
++  int pathlen = strlen (path);
++  char* end = path + pathlen - 1;
++  /* Preserve the lead '/' or lead "c:/".  */
++  char* start = path + (pathlen > 2 && path[1] == ':' ? 3 : 1);
++  
++  for (; end > start && IS_DIR_SEPARATOR (*end); end--)
++    *end = 0;
+ #endif
+ 
+   p = XNEW (cpp_dir);
diff --git a/packages/gcc/files/pr33281-mingw-host-fragment.patch b/packages/gcc/files/pr33281-mingw-host-fragment.patch
new file mode 100644
index 0000000..fd71bbd
--- /dev/null
+++ b/packages/gcc/files/pr33281-mingw-host-fragment.patch
@@ -0,0 +1,25 @@
+---
+ config/mh-mingw |    3 +++
+ configure.in    |    1 +
+ 2 files changed, 4 insertions(+)
+
+Index: gcc-4.2.3/config/mh-mingw
+===================================================================
+--- /dev/null
++++ gcc-4.2.3/config/mh-mingw
+@@ -0,0 +1,3 @@
++# Add -D__USE_MINGW_ACCESS to enable the built compiler to work on Windows
++# Vista (see PR33281 for details).
++BOOT_CFLAGS += -D__USE_MINGW_ACCESS
+Index: gcc-4.2.3/configure.in
+===================================================================
+--- gcc-4.2.3.orig/configure.in
++++ gcc-4.2.3/configure.in
+@@ -929,6 +929,7 @@ case "${host}" in
+     host_makefile_frag="config/mh-cygwin"
+     ;;
+   *-mingw32*)
++    host_makefile_frag="config/mh-mingw"
+     ;;
+   *-interix*)
+     host_makefile_frag="config/mh-interix"
diff --git a/packages/gcc/files/pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch b/packages/gcc/files/pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch
new file mode 100644
index 0000000..faf44c2
--- /dev/null
+++ b/packages/gcc/files/pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch
@@ -0,0 +1,13 @@
+---
+ config/mh-mingw |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: gcc-4.2.3/config/mh-mingw
+===================================================================
+--- gcc-4.2.3.orig/config/mh-mingw
++++ gcc-4.2.3/config/mh-mingw
+@@ -1,3 +1,4 @@
+ # Add -D__USE_MINGW_ACCESS to enable the built compiler to work on Windows
+ # Vista (see PR33281 for details).
+ BOOT_CFLAGS += -D__USE_MINGW_ACCESS
++CFLAGS += -D__USE_MINGW_ACCESS
diff --git a/packages/gcc/gcc-canadian-sdk_4.2.2.bb b/packages/gcc/gcc-canadian-sdk_4.2.2.bb
index 3a5bd4d..b179815 100644
--- a/packages/gcc/gcc-canadian-sdk_4.2.2.bb
+++ b/packages/gcc/gcc-canadian-sdk_4.2.2.bb
@@ -14,7 +14,8 @@ DEPENDS = "gmp-canadian mpfr-canadian"
 require gcc-configure-canadian-sdk.inc
 require gcc-package-canadian-sdk.inc
 
-SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1 \
+		  file://gcc-4.2-mingw-path-fixups.patch;patch=1"
 
 ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
 
diff --git a/packages/gcc/gcc-canadian-sdk_4.2.3.bb b/packages/gcc/gcc-canadian-sdk_4.2.3.bb
new file mode 100644
index 0000000..b179815
--- /dev/null
+++ b/packages/gcc/gcc-canadian-sdk_4.2.3.bb
@@ -0,0 +1,29 @@
+inherit canadian-sdk
+
+PR = "r1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
+
+PACKAGES = "${PN}"
+
+require gcc-${PV}.inc
+
+# Correct gmp / mpfr
+DEPENDS = "gmp-canadian mpfr-canadian"
+
+require gcc-configure-canadian-sdk.inc
+require gcc-package-canadian-sdk.inc
+
+SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1 \
+		  file://gcc-4.2-mingw-path-fixups.patch;patch=1"
+
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
+
+
+SRC_URI_append =+ "\
+	file://canadian-build-modules-configure.patch;patch=1 \
+"
+
+EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
+		--disable-libgomp --disable-libmudflap \
+		--with-mpfr=${STAGING_LIBDIR}"