[yocto] [meta-mingw][PATCH 3/4] gcc*.bbappend: Work with 5.2.

[Mark Hatle]

From: Peter Seebach <peter.seebach at windriver.com>

Rename the bbappends to use % so they can be used with both 4.x
and 5.x. None of these changes appear to be specific to a given
version of gcc.

Signed-off-by: Peter Seebach <peter.seebach at windriver.com>
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
---
 recipes-devtools/gcc/gcc-cross-canadian_%.bbappend     | 6 ++++++
 recipes-devtools/gcc/gcc-cross-canadian_4.9.bbappend   | 6 ------
 recipes-devtools/gcc/gcc-crosssdk-initial_%.bbappend   | 1 +
 recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bbappend | 1 -
 recipes-devtools/gcc/gcc-crosssdk_%.bbappend           | 1 +
 recipes-devtools/gcc/gcc-crosssdk_4.9.bbappend         | 1 -
 recipes-devtools/gcc/gcc-runtime_%.bbappend            | 8 ++++++++
 recipes-devtools/gcc/gcc-runtime_4.9.bbappend          | 8 --------
 recipes-devtools/gcc/libgcc_%.bbappend                 | 2 ++
 recipes-devtools/gcc/libgcc_4.9.bbappend               | 2 --
 10 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
 delete mode 100644 recipes-devtools/gcc/gcc-cross-canadian_4.9.bbappend
 create mode 100644 recipes-devtools/gcc/gcc-crosssdk-initial_%.bbappend
 delete mode 100644 recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bbappend
 create mode 100644 recipes-devtools/gcc/gcc-crosssdk_%.bbappend
 delete mode 100644 recipes-devtools/gcc/gcc-crosssdk_4.9.bbappend
 create mode 100644 recipes-devtools/gcc/gcc-runtime_%.bbappend
 delete mode 100644 recipes-devtools/gcc/gcc-runtime_4.9.bbappend
 create mode 100644 recipes-devtools/gcc/libgcc_%.bbappend
 delete mode 100644 recipes-devtools/gcc/libgcc_4.9.bbappend

diff --git a/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend b/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
new file mode 100644
index 0000000..030a9b9
--- /dev/null
+++ b/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
@@ -0,0 +1,6 @@
+INSANE_SKIP_${PN}_append_sdkmingw32 = " staticdev"
+EXTRA_OECONF_append_sdkmingw32 = " --disable-nls"
+LDFLAGS_append_sdkmingw32 = " -Wl,-static"
+EXEEXT_sdkmingw32 = ".exe"
+ELFUTILS_sdkmingw32 = ""
+DEPENDS_remove_sdkmingw32 = "nativesdk-gettext"
diff --git a/recipes-devtools/gcc/gcc-cross-canadian_4.9.bbappend b/recipes-devtools/gcc/gcc-cross-canadian_4.9.bbappend
deleted file mode 100644
index 030a9b9..0000000
--- a/recipes-devtools/gcc/gcc-cross-canadian_4.9.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-INSANE_SKIP_${PN}_append_sdkmingw32 = " staticdev"
-EXTRA_OECONF_append_sdkmingw32 = " --disable-nls"
-LDFLAGS_append_sdkmingw32 = " -Wl,-static"
-EXEEXT_sdkmingw32 = ".exe"
-ELFUTILS_sdkmingw32 = ""
-DEPENDS_remove_sdkmingw32 = "nativesdk-gettext"
diff --git a/recipes-devtools/gcc/gcc-crosssdk-initial_%.bbappend b/recipes-devtools/gcc/gcc-crosssdk-initial_%.bbappend
new file mode 100644
index 0000000..1c09342
--- /dev/null
+++ b/recipes-devtools/gcc/gcc-crosssdk-initial_%.bbappend
@@ -0,0 +1 @@
+DEPENDS_append_mingw32 = " nativesdk-mingw-w64-headers"
diff --git a/recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bbappend b/recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bbappend
deleted file mode 100644
index 1c09342..0000000
--- a/recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-DEPENDS_append_mingw32 = " nativesdk-mingw-w64-headers"
diff --git a/recipes-devtools/gcc/gcc-crosssdk_%.bbappend b/recipes-devtools/gcc/gcc-crosssdk_%.bbappend
new file mode 100644
index 0000000..77ba57f
--- /dev/null
+++ b/recipes-devtools/gcc/gcc-crosssdk_%.bbappend
@@ -0,0 +1 @@
+EXTRA_OECONF_mingw32 := "${@oe_filter_out('--with-linker-hash-style=${LINKER_HASH_STYLE}', '${EXTRA_OECONF}', d)}"
diff --git a/recipes-devtools/gcc/gcc-crosssdk_4.9.bbappend b/recipes-devtools/gcc/gcc-crosssdk_4.9.bbappend
deleted file mode 100644
index 77ba57f..0000000
--- a/recipes-devtools/gcc/gcc-crosssdk_4.9.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_OECONF_mingw32 := "${@oe_filter_out('--with-linker-hash-style=${LINKER_HASH_STYLE}', '${EXTRA_OECONF}', d)}"
diff --git a/recipes-devtools/gcc/gcc-runtime_%.bbappend b/recipes-devtools/gcc/gcc-runtime_%.bbappend
new file mode 100644
index 0000000..b068dfd
--- /dev/null
+++ b/recipes-devtools/gcc/gcc-runtime_%.bbappend
@@ -0,0 +1,8 @@
+FILES_libstdc++_append_mingw32 = " ${bindir}/libstdc++*.dll"
+FILES_libstdc++-staticdev_append_mingw32 = " ${libdir}/libstdc++.dll.a*"
+FILES_libssp_append_mingw32 = " ${bindir}/libssp*.dll"
+# FILES_libgomp_append_mingw32 = " ${bindir}/libgomp*.dll"
+
+RUNTIMETARGET_remove_mingw32 = "libatomic libgomp"
+
+DEPENDS_append_mingw32 = " pthreads-win32"
diff --git a/recipes-devtools/gcc/gcc-runtime_4.9.bbappend b/recipes-devtools/gcc/gcc-runtime_4.9.bbappend
deleted file mode 100644
index b068dfd..0000000
--- a/recipes-devtools/gcc/gcc-runtime_4.9.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILES_libstdc++_append_mingw32 = " ${bindir}/libstdc++*.dll"
-FILES_libstdc++-staticdev_append_mingw32 = " ${libdir}/libstdc++.dll.a*"
-FILES_libssp_append_mingw32 = " ${bindir}/libssp*.dll"
-# FILES_libgomp_append_mingw32 = " ${bindir}/libgomp*.dll"
-
-RUNTIMETARGET_remove_mingw32 = "libatomic libgomp"
-
-DEPENDS_append_mingw32 = " pthreads-win32"
diff --git a/recipes-devtools/gcc/libgcc_%.bbappend b/recipes-devtools/gcc/libgcc_%.bbappend
new file mode 100644
index 0000000..dd95317
--- /dev/null
+++ b/recipes-devtools/gcc/libgcc_%.bbappend
@@ -0,0 +1,2 @@
+FILES_${PN}_append_mingw32 = " ${base_libdir}/libgcc*.dll"
+FILES_${PN}-dev_append_mingw32 = " ${base_libdir}/libgcc*.a"
diff --git a/recipes-devtools/gcc/libgcc_4.9.bbappend b/recipes-devtools/gcc/libgcc_4.9.bbappend
deleted file mode 100644
index dd95317..0000000
--- a/recipes-devtools/gcc/libgcc_4.9.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILES_${PN}_append_mingw32 = " ${base_libdir}/libgcc*.dll"
-FILES_${PN}-dev_append_mingw32 = " ${base_libdir}/libgcc*.a"
-- 
1.9.3