Skip to contentSkip to conversation

Updates for krogoth/master

PATCH In review Juro Bystricky 4 participants 11 messages Aug 20, 2016 – Sep 28, 2016

lore
Share & tools
lore
#0 lore raw

cover Updates for krogoth/master

Krogoth recipes fail to cross-compile for Windows using meta-mingw layer. In particular, the following should/used to work (jethro with meta-mingw layer):

SDKMACHINE="i686-mingw32"
MACHINE="qemux86"
TCLIBC="baremetal"
bitbake gcc-cross-canadian-i586

SDKMACHINE="i686-mingw32"
MACHINE="qemux86"
bitbake meta-toolchain

This patchset updates meta-mingw layer so the above work for krogoth as well. There is no "krogoth" branch for meta-mingw, these patches should go there once the branch exists.
FWIW, I tested these patches with the current poky master as well, and succeed in cross-compiling of the most common recipes (for both SDKMACHINE=i686-mingw32 and SDKMACHINE=x86_64-mingw32) such as:
bitbake gcc-cross-canadian-i586
bitbake gdb-cross-canadian-i586
bitbake meta-toolchain
bitbake core-image-minimal -c populate_sdk

[YOCTO#10143]

Juro Bystricky (7):
*-mingw32.conf: Upgrade for krogoth gettext_0.19.4.bbappend: Update for later versions binutils-cross-canadian_2.25%.bbappend: Work with all 2.2* versions
gcc-runtime: Drop libitm for mingw32 runtime gmp_6.0.0.bbappend: Removed
mpfr_3.1.3.bbappend: Work with all 3.1.% versions gdb-cross-canadian_7.9.1: Work with all 7.% versions

 conf/machine-sdk/i686-mingw32.conf                               | 7 ++++++-
 conf/machine-sdk/x86_64-mingw32.conf                             | 7 ++++++-
 recipes-core/gettext/gettext_0.19.%.bbappend                     | 6 ++++++
 recipes-core/gettext/gettext_0.19.4.bbappend                     | 2 --
 recipes-devtools/binutils/binutils-cross-canadian_2.2%.bbappend  | 5 +++++
 recipes-devtools/binutils/binutils-cross-canadian_2.25%.bbappend | 5 -----
 recipes-devtools/gcc/gcc-runtime_%.bbappend                      | 1 +
 recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend             | 7 +++++++
 recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bbappend           | 5 -----
 recipes-support/gmp/gmp_6.0.0.bbappend                           | 3 ---
 recipes-support/mpfr/mpfr_3.1.%.bbappend                         | 1 +
 recipes-support/mpfr/mpfr_3.1.3.bbappend                         | 1 -
 12 files changed, 32 insertions(+), 18 deletions(-)
 create mode 100644 recipes-core/gettext/gettext_0.19.%.bbappend
 delete mode 100644 recipes-core/gettext/gettext_0.19.4.bbappend
 create mode 100644 recipes-devtools/binutils/binutils-cross-canadian_2.2%.bbappend
 delete mode 100644 recipes-devtools/binutils/binutils-cross-canadian_2.25%.bbappend
 create mode 100644 recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend
 delete mode 100644 recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bbappend
 delete mode 100644 recipes-support/gmp/gmp_6.0.0.bbappend
 create mode 100644 recipes-support/mpfr/mpfr_3.1.%.bbappend
 delete mode 100644 recipes-support/mpfr/mpfr_3.1.3.bbappend
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/7 *-mingw32.conf: Upgrade for krogoth

Use explicit mingw32 override for

   PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial

to avoid multiple providers and consequently broken builds.

Allow building static libraries, disabled by default.

---
 conf/machine-sdk/i686-mingw32.conf   | 7 ++++++-
 conf/machine-sdk/x86_64-mingw32.conf | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
conf/machine-sdk/i686-mingw32.conf +6 -1
index 0bdedaa..d426fe3 100644
@@ -3,7 +3,8 @@ SDK_OS = "mingw32"
 
 GCCTHREADS_mingw32 = "win32"
 
-PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-mingw-w64-runtime"
+PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime"
+PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime"
 PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime"
 PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime"
 PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv"
@@ -29,3 +30,7 @@ export WINDRES = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}"
 export RC = "${WINDRES}"
 
 BB_HASHBASE_WHITELIST_append = " WINDRES RC"
+
+# Needed to override no-static-libs.inc
+DISABLE_STATIC_mingw32 = ""
+
conf/machine-sdk/x86_64-mingw32.conf +6 -1
index 5e80dfa..b9706f9 100644
@@ -3,7 +3,8 @@ SDK_OS = "mingw32"
 
 GCCTHREADS_mingw32 = "win32"
 
-PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-mingw-w64-runtime"
+PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime"
+PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime"
 PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime"
 PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime"
 PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv"
@@ -29,3 +30,7 @@ export WINDRES = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}"
 export RC = "${WINDRES}"
 
 BB_HASHBASE_WHITELIST_append = " WINDRES RC"
+
+# Needed to override no-static-libs.inc
+DISABLE_STATIC_mingw32 = ""
+
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/7 gettext_0.19.4.bbappend: Update for later versions

In reply to Juro Bystricky

Modified to work properly with later versions.
Only static build supported.
(Tested up to 0.19.8.1)

---
 recipes-core/gettext/gettext_0.19.%.bbappend | 6 ++++++
 recipes-core/gettext/gettext_0.19.4.bbappend | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 recipes-core/gettext/gettext_0.19.%.bbappend
 delete mode 100644 recipes-core/gettext/gettext_0.19.4.bbappend
recipes-core/gettext/gettext_0.19.%.bbappend new file +6 -0
new file mode 100644
index 0000000..efd10d6
@@ -0,0 +1,6 @@
+DEPENDS_append_mingw32 = " pthreads-win32"
+LDFLAGS_prepend_mingw32 = " -lpthread "
+
+CFLAGS_append_mingw32 = " -DLIBXML_STATIC"
+EXTRA_OECONF_append_mingw32 = " --enable-threads=windows --enable-static --disable-shared "
+
recipes-core/gettext/gettext_0.19.4.bbappend deleted +0 -2
deleted file mode 100644
index ac76feb..0000000
@@ -1,2 +0,0 @@
-DEPENDS_append_mingw32 = " pthreads-win32"
-LDFLAGS_prepend_mingw32 = " -lpthread "
Signature · 1 line
2.7.4
#3 lore raw

PATCH 3/7 binutils-cross-canadian_2.25%.bbappend: Work with all 2.2* versions

In reply to Juro Bystricky

Tested up to 2.27

---
 recipes-devtools/binutils/binutils-cross-canadian_2.2%.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.2%.bbappend
 delete mode 100644 recipes-devtools/binutils/binutils-cross-canadian_2.25%.bbappend
recipes-devtools/binutils/binutils-cross-canadian_2.2%.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
2.7.4
#4 lore raw

PATCH 4/7 gcc-runtime: Drop libitm for mingw32 runtime

In reply to Juro Bystricky

libitm mingw build presently not supported, so don't build it.

---
 recipes-devtools/gcc/gcc-runtime_%.bbappend | 1 +
 1 file changed, 1 insertion(+)
recipes-devtools/gcc/gcc-runtime_%.bbappend +1 -0
index b068dfd..df0ac9e 100644
@@ -4,5 +4,6 @@ FILES_libssp_append_mingw32 = " ${bindir}/libssp*.dll"
 # FILES_libgomp_append_mingw32 = " ${bindir}/libgomp*.dll"
 
 RUNTIMETARGET_remove_mingw32 = "libatomic libgomp"
+RUNTIMETARGET_remove_mingw32 = "libitm"
 
 DEPENDS_append_mingw32 = " pthreads-win32"
Signature · 1 line
2.7.4
#5 lore raw

PATCH 5/7 gmp_6.0.0.bbappend: Removed

In reply to Juro Bystricky

Not needed anymore.

---
 recipes-support/gmp/gmp_6.0.0.bbappend | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 recipes-support/gmp/gmp_6.0.0.bbappend
recipes-support/gmp/gmp_6.0.0.bbappend deleted +0 -3
deleted file mode 100644
index 7f25fe2..0000000
@@ -1,3 +0,0 @@
-do_install_append_mingw32 () {
-	ln -s libgmp.lib ${D}${libdir}/gmp.lib 
-}
\ No newline at end of file
Signature · 1 line
2.7.4
#6 lore raw

PATCH 6/7 mpfr_3.1.3.bbappend: Work with all 3.1.% versions

In reply to Juro Bystricky

Tested with 3.1.4.

---
 recipes-support/mpfr/mpfr_3.1.%.bbappend | 1 +
 recipes-support/mpfr/mpfr_3.1.3.bbappend | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 recipes-support/mpfr/mpfr_3.1.%.bbappend
 delete mode 100644 recipes-support/mpfr/mpfr_3.1.3.bbappend
recipes-support/mpfr/mpfr_3.1.%.bbappend new file +1 -0
new file mode 100644
index 0000000..4252e8d
@@ -0,0 +1 @@
+EXTRA_OECONF_append_mingw32 = " --disable-shared"
\ No newline at end of file
recipes-support/mpfr/mpfr_3.1.3.bbappend deleted +0 -1
deleted file mode 100644
index 4252e8d..0000000
@@ -1 +0,0 @@
-EXTRA_OECONF_append_mingw32 = " --disable-shared"
\ No newline at end of file
Signature · 1 line
2.7.4
#7 lore raw

PATCH 7/7 gdb-cross-canadian_7.9.1: Work with all 7.% versions

In reply to Juro Bystricky

Tested with 7.11.

---
 recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend   | 7 +++++++
 recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bbappend | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend
 delete mode 100644 recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bbappend
recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend new file +7 -0
new file mode 100644
index 0000000..54b975a
@@ -0,0 +1,7 @@
+LDFLAGS_append_sdkmingw32 = " -Wl,-static"
+EXEEXT_sdkmingw32 = ".exe"
+DEPENDS_remove_sdkmingw32 = "nativesdk-ncurses nativesdk-readline nativesdk-python"
+RDEPENDS_${PN}_remove_sdkmingw32 = "nativesdk-python-core nativesdk-python-lang nativesdk-python-re nativesdk-python-codecs nativesdk-python-netclient"
+EXTRA_OECONF_append_sdkmingw32 = "--without-curses --without-system-readline --with-python=no"
+PACKAGECONFIG_remove_sdkmingw32 = "readline"
+PACKAGECONFIG_remove_sdkmingw32 = "python"
recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bbappend deleted +0 -5
deleted file mode 100644
index bf4bd75..0000000
@@ -1,5 +0,0 @@
-LDFLAGS_append_sdkmingw32 = " -Wl,-static"
-EXEEXT_sdkmingw32 = ".exe"
-DEPENDS_remove_sdkmingw32 = "nativesdk-ncurses nativesdk-readline nativesdk-python"
-RDEPENDS_${PN}_remove_sdkmingw32 = "nativesdk-python-core nativesdk-python-lang nativesdk-python-re nativesdk-python-codecs nativesdk-python-netclient"
-EXTRA_OECONF_append_sdkmingw32 = "--without-curses --without-system-readline --with-python=no"
Signature · 1 line
2.7.4
#8 lore raw
In reply to Juro Bystricky
Quoted 26 lines · Juro Bystricky

Krogoth recipes fail to cross-compile for Windows using meta-mingw layer. In particular, the following should/used to work (jethro with meta-mingw layer):

SDKMACHINE="i686-mingw32"
MACHINE="qemux86"
TCLIBC="baremetal"
bitbake gcc-cross-canadian-i586

SDKMACHINE="i686-mingw32"
MACHINE="qemux86"
bitbake meta-toolchain

This patchset updates meta-mingw layer so the above work for krogoth as well. There is no "krogoth" branch for meta-mingw, these patches should go there once the branch exists.
FWIW, I tested these patches with the current poky master as well, and succeed in cross-compiling of the most common recipes (for both SDKMACHINE=i686-mingw32 and SDKMACHINE=x86_64-mingw32) such as:
bitbake gcc-cross-canadian-i586
bitbake gdb-cross-canadian-i586
bitbake meta-toolchain
bitbake core-image-minimal -c populate_sdk

Quoted 1 line

[YOCTO#10143]

Whole series is fine.

Quoted 43 lines

Juro Bystricky (7):
*-mingw32.conf: Upgrade for krogoth gettext_0.19.4.bbappend: Update for later versions binutils-cross-canadian_2.25%.bbappend: Work with all 2.2* versions
gcc-runtime: Drop libitm for mingw32 runtime gmp_6.0.0.bbappend: Removed
mpfr_3.1.3.bbappend: Work with all 3.1.% versions gdb-cross-canadian_7.9.1: Work with all 7.% versions

conf/machine-sdk/i686-mingw32.conf                               | 7 ++++++-
conf/machine-sdk/x86_64-mingw32.conf                             | 7 ++++++-
recipes-core/gettext/gettext_0.19.%.bbappend                     | 6 ++++++
recipes-core/gettext/gettext_0.19.4.bbappend                     | 2 --
recipes-devtools/binutils/binutils-cross-canadian_2.2%.bbappend  | 5 +++++
recipes-devtools/binutils/binutils-cross-canadian_2.25%.bbappend | 5 -----
recipes-devtools/gcc/gcc-runtime_%.bbappend                      | 1 +
recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend             | 7 +++++++
recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bbappend           | 5 -----
recipes-support/gmp/gmp_6.0.0.bbappend                           | 3 ---
recipes-support/mpfr/mpfr_3.1.%.bbappend                         | 1 +
recipes-support/mpfr/mpfr_3.1.3.bbappend                         | 1 -
12 files changed, 32 insertions(+), 18 deletions(-)

create mode 100644 recipes-core/gettext/gettext_0.19.%.bbappend
delete mode 100644 recipes-core/gettext/gettext_0.19.4.bbappend
create mode 100644 recipes-devtools/binutils/binutils-cross-canadian_2.2%.bbappend delete mode 100644 recipes-devtools/binutils/binutils-cross-canadian_2.25%.bbappend create mode 100644 recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend delete mode 100644 recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bbappend delete mode 100644 recipes-support/gmp/gmp_6.0.0.bbappend
create mode 100644 recipes-support/mpfr/mpfr_3.1.%.bbappend
delete mode 100644 recipes-support/mpfr/mpfr_3.1.3.bbappend

--
2.7.4

--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

#9 lore raw
In reply to Juro Bystricky
Quoted 23 lines · Juro Bystricky

Krogoth recipes fail to cross-compile for Windows using meta-mingw layer. In particular, the following should/used to work (jethro with meta-mingw layer):

SDKMACHINE="i686-mingw32"
MACHINE="qemux86"
TCLIBC="baremetal"
bitbake gcc-cross-canadian-i586

SDKMACHINE="i686-mingw32"
MACHINE="qemux86"
bitbake meta-toolchain

This patchset updates meta-mingw layer so the above work for krogoth as well. There is no "krogoth" branch for meta-mingw, these patches should go there once the branch exists.
FWIW, I tested these patches with the current poky master as well, and succeed in cross-compiling of the most common recipes (for both SDKMACHINE=i686-mingw32 and SDKMACHINE=x86_64-mingw32) such as:
bitbake gcc-cross-canadian-i586
bitbake gdb-cross-canadian-i586
bitbake meta-toolchain
bitbake core-image-minimal -c populate_sdk

Quoted 1 line

[YOCTO#10143]

Ping? Any info when this series will be integrated?

Thank you,
Ionel

Quoted 43 lines

Juro Bystricky (7):
*-mingw32.conf: Upgrade for krogoth gettext_0.19.4.bbappend: Update for later versions binutils-cross-canadian_2.25%.bbappend: Work with all 2.2* versions
gcc-runtime: Drop libitm for mingw32 runtime gmp_6.0.0.bbappend: Removed
mpfr_3.1.3.bbappend: Work with all 3.1.% versions gdb-cross-canadian_7.9.1: Work with all 7.% versions

 conf/machine-sdk/i686-mingw32.conf                               | 7 ++++++-
 conf/machine-sdk/x86_64-mingw32.conf                             | 7 ++++++-
 recipes-core/gettext/gettext_0.19.%.bbappend                     | 6 ++++++
 recipes-core/gettext/gettext_0.19.4.bbappend                     | 2 --
 recipes-devtools/binutils/binutils-cross-canadian_2.2%.bbappend  | 5 +++++
 recipes-devtools/binutils/binutils-cross-canadian_2.25%.bbappend | 5 -----
 recipes-devtools/gcc/gcc-runtime_%.bbappend                      | 1 +
 recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend             | 7 +++++++
 recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bbappend           | 5 -----
 recipes-support/gmp/gmp_6.0.0.bbappend                           | 3 ---
 recipes-support/mpfr/mpfr_3.1.%.bbappend                         | 1 +
 recipes-support/mpfr/mpfr_3.1.3.bbappend                         | 1 -
 12 files changed, 32 insertions(+), 18 deletions(-)
 create mode 100644 recipes-core/gettext/gettext_0.19.%.bbappend
 delete mode 100644 recipes-core/gettext/gettext_0.19.4.bbappend
 create mode 100644 recipes-devtools/binutils/binutils-cross-canadian_2.2%.bbappend
 delete mode 100644 recipes-devtools/binutils/binutils-cross-canadian_2.25%.bbappend
 create mode 100644 recipes-devtools/gdb/gdb-cross-canadian_7.%.bbappend
 delete mode 100644 recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bbappend
 delete mode 100644 recipes-support/gmp/gmp_6.0.0.bbappend
 create mode 100644 recipes-support/mpfr/mpfr_3.1.%.bbappend
 delete mode 100644 recipes-support/mpfr/mpfr_3.1.3.bbappend
Signature · 7 lines
2.7.4

-- 
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
#10 lore raw
Quoted 31 lines · Ioan-Adrian Ratiu
Quoted 30 lines · Juro Bystricky

Krogoth recipes fail to cross-compile for Windows using meta-mingw layer.
In particular, the following should/used to work (jethro with meta- mingw layer):

SDKMACHINE="i686-mingw32"
MACHINE="qemux86"
TCLIBC="baremetal"
bitbake gcc-cross-canadian-i586

SDKMACHINE="i686-mingw32"
MACHINE="qemux86"
bitbake meta-toolchain

This patchset updates meta-mingw layer so the above work for krogoth as well.
There is no "krogoth" branch for meta-mingw, these patches should go there once the
branch exists.
FWIW, I tested these patches with the current poky master as well, and succeed in cross-compiling
of the most common recipes (for both SDKMACHINE=i686-mingw32 and SDKMACHINE=x86_64-mingw32)
such as:
    bitbake gcc-cross-canadian-i586
    bitbake gdb-cross-canadian-i586
    bitbake meta-toolchain
    bitbake core-image-minimal -c populate_sdk

Quoted 2 lines
Quoted 1 line

[YOCTO#10143]

Ping? Any info when this series will be integrated?

I'd tried multiple times to untangle which set of patches this needed to be applied on top of (several of Mark Hatle's). I think I've finally figured it out and have pushed things.

Cheers,

Richard