[OE-core] [PATCH] qemu-native: set ld.bfd, fix cflags, and set some environment vars
Stephen Arnold
stephen.arnold42 at gmail.com
Mon Jun 13 01:23:03 UTC 2016
Okay, that wasn't supposed to cut off the v2 after PATCH...
Anyway, this is/was v2 for master branch (needs testing).
Steve
On Sun, Jun 12, 2016 at 6:09 PM, Stephen Arnold <sarnold at vctlabs.com> wrote:
> The main thing is build failures with gold linker, but qemu is also a
> little too aggressive at finding random tools on the build host, so we
> also set the build env for qemu-native and make sure it doesn't reset
> its own (hard-coded) cflags when we don't want it to.
>
> Signed-off-by: Stephen Arnold <sarnold at vctlabs.com>
> ---
> meta/recipes-devtools/qemu/qemu.inc | 13 +++++++++++--
> meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch | 13 +++++++++++++
> meta/recipes-devtools/qemu/qemu_2.6.0.bb | 4 +++-
> 3 files changed, 27 insertions(+), 3 deletions(-)
> create mode 100644 meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch
>
> diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
> index bf689bb..d5925fd 100644
> --- a/meta/recipes-devtools/qemu/qemu.inc
> +++ b/meta/recipes-devtools/qemu/qemu.inc
> @@ -30,8 +30,12 @@ SRC_URI_append_class-native = "\
>
> EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-bluez --disable-libiscsi --with-system-pixman --extra-cflags='${CFLAGS}'"
>
> -EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror \
> - "
> +EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror"
> +
> +EXTRA_OEMAKE_append_class-native = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'"
> +
> +LDFLAGS_append_class-native = " -fuse-ld=bfd"
> +
> export LIBTOOL="${HOST_SYS}-libtool"
>
> do_configure_prepend_class-native() {
> @@ -40,6 +44,11 @@ do_configure_prepend_class-native() {
> if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
> export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
> fi
> +
> + # Alter target makefiles to accept CFLAGS set via env
> + sed -i -r \
> + -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
> + "${S}"/Makefile "${S}"/Makefile.target
> }
>
> KVMENABLE = "--enable-kvm"
> diff --git a/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch b/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch
> new file mode 100644
> index 0000000..173394f
> --- /dev/null
> +++ b/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch
> @@ -0,0 +1,13 @@
> +--- a/configure
> ++++ b/configure
> +@@ -4468,10 +4468,6 @@ fi
> + if test "$gcov" = "yes" ; then
> + CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
> + LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
> +-elif test "$fortify_source" = "yes" ; then
> +- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
> +-elif test "$debug" = "no"; then
> +- CFLAGS="-O2 $CFLAGS"
> + fi
> +
> + ##########################################
> diff --git a/meta/recipes-devtools/qemu/qemu_2.6.0.bb b/meta/recipes-devtools/qemu/qemu_2.6.0.bb
> index e391326..735d013 100644
> --- a/meta/recipes-devtools/qemu/qemu_2.6.0.bb
> +++ b/meta/recipes-devtools/qemu/qemu_2.6.0.bb
> @@ -8,7 +8,9 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
> file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \
> file://no-valgrind.patch \
> file://pathlimit.patch \
> - "
> + file://qemu-2.5.0-cflags.patch \
> +"
> +
> SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
> SRC_URI[md5sum] = "ca3f70b43f093e33e9e014f144067f13"
> SRC_URI[sha256sum] = "c9ac4a651b273233d21b8bec32e30507cb9cce7900841febc330956a1a8434ec"
> --
> 2.8.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
More information about the Openembedded-core
mailing list