Skip to contentSkip to conversation

Fix meta-mingw support to work with Jethro

PATCH New Mark Hatle 1 participant 5 messages Oct 20, 2015

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover Fix meta-mingw support to work with Jethro

Mark Hatle (1):
nativesdk-gcc: Add mingw32 named libraries to files list

Peter Seebach (3):
gcc-runtime: Drop libgomp for mingw32 runtime
binutils*.bbappend: Work with all 2.25 versions
gcc*.bbappend: Work with 5.2.

 recipes-devtools/binutils/binutils-cross-canadian_2.25%.bbappend | 5 +++++
 recipes-devtools/binutils/binutils-cross-canadian_2.25.bbappend  | 5 -----
 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/gcc_%.bbappend                              | 6 ++++++
 recipes-devtools/gcc/libgcc_%.bbappend                           | 2 ++
 recipes-devtools/gcc/libgcc_4.9.bbappend                         | 2 --
 13 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 recipes-devtools/binutils/binutils-cross-canadian_2.25%.bbappend
 delete mode 100644 recipes-devtools/binutils/binutils-cross-canadian_2.25.bbappend
 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/gcc_%.bbappend
 create mode 100644 recipes-devtools/gcc/libgcc_%.bbappend
 delete mode 100644 recipes-devtools/gcc/libgcc_4.9.bbappend
Signature · 1 line
1.9.3
author
#1 lore raw

PATCH 1/4 gcc-runtime: Drop libgomp for mingw32 runtime

From: Peter Seebach <[email protected]>

The mingw32 runtime has issues building libgomp, so drop it for now.

---
 recipes-devtools/gcc/gcc-runtime_4.9.bbappend | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-devtools/gcc/gcc-runtime_4.9.bbappend +2 -2
index 50ca3ca..b068dfd 100644
@@ -1,8 +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"
+# FILES_libgomp_append_mingw32 = " ${bindir}/libgomp*.dll"
 
-RUNTIMETARGET_remove_mingw32 = "libatomic"
+RUNTIMETARGET_remove_mingw32 = "libatomic libgomp"
 
 DEPENDS_append_mingw32 = " pthreads-win32"
Signature · 1 line
1.9.3
author
#2 lore raw

PATCH 2/4 binutils*.bbappend: Work with all 2.25 versions

In reply to Mark Hatle

From: Peter Seebach <[email protected]>

---
 recipes-devtools/binutils/binutils-cross-canadian_2.25%.bbappend | 5 +++++
 recipes-devtools/binutils/binutils-cross-canadian_2.25.bbappend  | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 recipes-devtools/binutils/binutils-cross-canadian_2.25%.bbappend
 delete mode 100644 recipes-devtools/binutils/binutils-cross-canadian_2.25.bbappend
recipes-devtools/binutils/binutils-cross-canadian_2.25%.bbappend new file +5 -0
new file mode 100644
index 0000000..026c932
@@ -0,0 +1,5 @@
+EXTRA_OECONF_append_sdkmingw32 = " --disable-plugins --disable-nls"
+LDFLAGS_append_sdkmingw32 = " -Wl,-static"
+
+DEPENDS_remove_sdkmingw32 = "nativesdk-gettext"
+DEPENDS_remove_sdkmingw32 = "nativesdk-flex"
recipes-devtools/binutils/binutils-cross-canadian_2.25.bbappend deleted +0 -5
deleted file mode 100644
index 026c932..0000000
@@ -1,5 +0,0 @@
-EXTRA_OECONF_append_sdkmingw32 = " --disable-plugins --disable-nls"
-LDFLAGS_append_sdkmingw32 = " -Wl,-static"
-
-DEPENDS_remove_sdkmingw32 = "nativesdk-gettext"
-DEPENDS_remove_sdkmingw32 = "nativesdk-flex"
Signature · 1 line
1.9.3
author
#3 lore raw

PATCH 3/4 gcc*.bbappend: Work with 5.2.

In reply to Mark Hatle

From: Peter Seebach <[email protected]>

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.

---
 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
recipes-devtools/gcc/gcc-cross-canadian_%.bbappend new file +6 -0
new file mode 100644
index 0000000..030a9b9
@@ -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"
recipes-devtools/gcc/gcc-cross-canadian_4.9.bbappend deleted +0 -6
deleted file mode 100644
index 030a9b9..0000000
@@ -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"
recipes-devtools/gcc/gcc-crosssdk-initial_%.bbappend new file +1 -0
new file mode 100644
index 0000000..1c09342
@@ -0,0 +1 @@
+DEPENDS_append_mingw32 = " nativesdk-mingw-w64-headers"
recipes-devtools/gcc/gcc-crosssdk-initial_4.9.bbappend deleted +0 -1
deleted file mode 100644
index 1c09342..0000000
@@ -1 +0,0 @@
-DEPENDS_append_mingw32 = " nativesdk-mingw-w64-headers"
recipes-devtools/gcc/gcc-crosssdk_%.bbappend new file +1 -0
new file mode 100644
index 0000000..77ba57f
@@ -0,0 +1 @@
+EXTRA_OECONF_mingw32 := "${@oe_filter_out('--with-linker-hash-style=${LINKER_HASH_STYLE}', '${EXTRA_OECONF}', d)}"
recipes-devtools/gcc/gcc-crosssdk_4.9.bbappend deleted +0 -1
deleted file mode 100644
index 77ba57f..0000000
@@ -1 +0,0 @@
-EXTRA_OECONF_mingw32 := "${@oe_filter_out('--with-linker-hash-style=${LINKER_HASH_STYLE}', '${EXTRA_OECONF}', d)}"
recipes-devtools/gcc/gcc-runtime_%.bbappend new file +8 -0
new file mode 100644
index 0000000..b068dfd
@@ -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"
recipes-devtools/gcc/gcc-runtime_4.9.bbappend deleted +0 -8
deleted file mode 100644
index b068dfd..0000000
@@ -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"
recipes-devtools/gcc/libgcc_%.bbappend new file +2 -0
new file mode 100644
index 0000000..dd95317
@@ -0,0 +1,2 @@
+FILES_${PN}_append_mingw32 = " ${base_libdir}/libgcc*.dll"
+FILES_${PN}-dev_append_mingw32 = " ${base_libdir}/libgcc*.a"
recipes-devtools/gcc/libgcc_4.9.bbappend deleted +0 -2
deleted file mode 100644
index dd95317..0000000
@@ -1,2 +0,0 @@
-FILES_${PN}_append_mingw32 = " ${base_libdir}/libgcc*.dll"
-FILES_${PN}-dev_append_mingw32 = " ${base_libdir}/libgcc*.a"
Signature · 1 line
1.9.3
author
#4 lore raw

PATCH 4/4 nativesdk-gcc: Add mingw32 named libraries to files list

In reply to Mark Hatle

Also we skip the staticdev sanity check, as the '.a' file should be packaged as listed.

---
 recipes-devtools/gcc/gcc_%.bbappend | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 recipes-devtools/gcc/gcc_%.bbappend
recipes-devtools/gcc/gcc_%.bbappend new file +6 -0
new file mode 100644
index 0000000..a779bb9
@@ -0,0 +1,6 @@
+FILES_${PN}_append_mingw32 = "\
+   ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto_plugin-0.dll \
+   ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto_plugin.dll.a \
+"
+
+INSANE_SKIP_append_mingw32 = " staticdev"
Signature · 1 line
1.9.3