Update to YP 2.0
cover Update to YP 2.0
The first 6 of the patches referenced in this summary have previous been sent to the Yocto Project mailing list. I will only be sending patches 7 and 8 as they are new.
They entire patch set can be inspected at:
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=mgh/meta-mingw
or git fetched from:
git://git.yoctoproject.org/poky-contrib mgh/meta-mingw
I would recommend they all be merged to master and jethro branches of the meta-mingw tree.
Mark Hatle (5):
nativesdk-gcc: Add mingw32 named libraries to files list
meta-environment: Update environment files to batch files
toolchain-scripts-mingw32: Use short paths (8.3) toolchain-scripts-mingw32.bbclass: Update to match YP 2.0 release
gcc-cross-canadian: Workaround LTO failure
Peter Seebach (3):
gcc-runtime: Drop libgomp for mingw32 runtime
binutils*.bbappend: Work with all 2.25 versions
gcc*.bbappend: Work with 5.2.
classes/toolchain-scripts-mingw32.bbclass | 94 ++++++++++++++++++++++ recipes-core/meta/meta-environment.bbappend | 4 + .../binutils-cross-canadian_2.25%.bbappend | 5 ++ .../binutils/binutils-cross-canadian_2.25.bbappend | 5 -- recipes-devtools/gcc/gcc-cross-canadian_%.bbappend | 6 ++ .../gcc/gcc-cross-canadian_4.9.bbappend | 6 -- .../gcc/gcc-crosssdk-initial_%.bbappend | 1 + .../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 - 15 files changed, 127 insertions(+), 23 deletions(-) create mode 100644 classes/toolchain-scripts-mingw32.bbclass create mode 100644 recipes-core/meta/meta-environment.bbappend 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
PATCH 7/8 toolchain-scripts-mingw32.bbclass: Update to match YP 2.0 release
The environment script generatation is updated to match YP 2.0 version.
In addition, there was an error in the way the EXTRAPATH component was being generated.
--- classes/toolchain-scripts-mingw32.bbclass | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
classes/toolchain-scripts-mingw32.bbclass +15 -9
@@ -1,30 +1,35 @@ # Based off of the oe-core meta/classes/toolchain-scripts.bbclass version toolchain_create_sdk_env_script_sdkmingw32 () { # Create environment setup script + sdkpathnative=${7:-${SDKPATHNATIVE}} + prefix=${6:-${prefix_nativesdk}} + bindir=${5:-${bindir_nativesdk}} libdir=${4:-${libdir}} sysroot=${3:-${SDKTARGETSYSROOT}} - sysroot=${sysroot##${SDKPATH}} - pathnative=${SDKPATHNATIVE} - pathnative=${pathnative##${SDKPATH}} multimach_target_sys=${2:-${REAL_MULTIMACH_TARGET_SYS}} script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-$multimach_target_sys}.bat rm -f $script touch $script # Be sure to use the 'short' path, so we can have deeper directories. echo 'set SDKROOT=%~sdp0%' >> $script - echo 'set SDKTARGETSYSROOT=%SDKROOT%'"$sysroot" >> $script + + # Convert to mingw32 subpaths + sysroot='%SDKROOT%'${sysroot##${SDKPATH}} + sdkpathnative='%SDKROOT%'${sdkpathnative##${SDKPATH}} + + echo 'set SDKTARGETSYSROOT='"$sysroot" >> $script EXTRAPATH="" for i in ${CANADIANEXTRAOS}; do - EXTRAPATH="$EXTRAPATH;%~\$PATH:0%$pathnative${bindir_nativesdk}/${TARGET_ARCH}${TARGET_VENDOR}-$i" + EXTRAPATH="$EXTRAPATH;$sdkpathnative$bindir/${TARGET_ARCH}${TARGET_VENDOR}-$i" done - echo 'set PATH=%SDKROOT%'"$pathnative"'${bindir_nativesdk};%SDKROOT%'"$pathnative"'${bindir_nativesdk}/${TARGET_SYS}'"$EXTRAPATH"';%PATH%' >> $script + echo "set PATH=$sdkpathnative$bindir;$sdkpathnative$bindir/../${HOST_SYS}/bin;$sdkpathnative$bindir/${TARGET_SYS}"$EXTRAPATH';%PATH%' >> $script echo 'set PKG_CONFIG_SYSROOT_DIR=%SDKTARGETSYSROOT%' >> $script echo 'set PKG_CONFIG_PATH=%SDKTARGETSYSROOT%'"$libdir"'/pkgconfig' >> $script echo 'set CONFIG_SITE=%SDKROOT%/site-config-'"${multimach_target_sys}" >> $script - echo 'set OECORE_NATIVE_SYSROOT=%SDKROOT%'"$pathnative" >> $script + echo "set OECORE_NATIVE_SYSROOT=$sdkpathnative" >> $script echo 'set OECORE_TARGET_SYSROOT=%SDKTARGETSYSROOT%' >> $script - echo 'set OECORE_ACLOCAL_OPTS=-I %SDKROOT%'"$pathnative"'/usr/share/aclocal' >> $script - echo 'set PYTHONHOME=%SDKROOT%'"$pathnative"'${prefix_nativesdk}' >> $script + echo "set OECORE_ACLOCAL_OPTS=-I $sdkpathnative/usr/share/aclocal" >> $script + echo "set PYTHONHOME=$sdkpathnative$prefix" >> $script toolchain_shared_env_script
@@ -56,6 +61,7 @@ toolchain_shared_env_script_sdkmingw32 () { echo 'set CXXFLAGS=${TARGET_CXXFLAGS}' >> $script echo 'set LDFLAGS=${TARGET_LDFLAGS}' >> $script echo 'set CPPFLAGS=${TARGET_CPPFLAGS}' >> $script + echo 'set KCFLAGS=--sysroot=%SDKTARGETSYSROOT%' >> $script echo 'set OECORE_DISTRO_VERSION=${DISTRO_VERSION}' >> $script echo 'set OECORE_SDK_VERSION=${SDK_VERSION}' >> $script echo 'set ARCH=${ARCH}' >> $script
Signature · 1 line
1.9.3
PATCH 8/8 gcc-cross-canadian: Workaround LTO failure
In reply to Mark HatleWorkaround for the failure:
e:/windri~1/lx8.sdk/qemux8~1.800/sysroots/i686-w~1/usr/bin/i586-w~3/../../libexec/i586-wrs-linux/gcc/i586-wrs-linux/5.2.0/real-ld.exe: unrecognized option '-plugin'
This disables the LTO support in the compiler, but does allow things to compile and link properly.
--- recipes-devtools/gcc/gcc-cross-canadian_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-devtools/gcc/gcc-cross-canadian_%.bbappend +1 -1
@@ -1,5 +1,5 @@ INSANE_SKIP_${PN}_append_sdkmingw32 = " staticdev" -EXTRA_OECONF_append_sdkmingw32 = " --disable-nls" +EXTRA_OECONF_append_sdkmingw32 = " --disable-nls --disable-lto" LDFLAGS_append_sdkmingw32 = " -Wl,-static" EXEEXT_sdkmingw32 = ".exe" ELFUTILS_sdkmingw32 = ""
Signature · 1 line
1.9.3