From be068fec4927666ad84f8955b8cf65e9e25e837f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 14 Oct 2021 07:46:23 -0700 Subject: meta-xilinx-standalone: various fixes for override syntax changes Signed-off-by: Mark Hatle --- meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend | 4 ++-- meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend | 4 ++-- meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend | 6 +++--- .../recipes-core/packagegroups/packagegroup-cross-canadian.bbappend | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'meta-xilinx-standalone/recipes-core') diff --git a/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend b/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend index ff7d2c72..2d227e3d 100644 --- a/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend +++ b/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend @@ -8,5 +8,5 @@ HOST_DEPENDS = " \ nativesdk-sdk-provides-dummy \ " -TOOLCHAIN_HOST_TASK_xilinx-standalone = "${HOST_DEPENDS} packagegroup-cross-canadian-${MACHINE}" -TOOLCHAIN_TARGET_TASK_xilinx-standalone = "${@multilib_pkg_extend(d, 'packagegroup-newlib-standalone-sdk-target')}" +TOOLCHAIN_HOST_TASK:xilinx-standalone = "${HOST_DEPENDS} packagegroup-cross-canadian-${MACHINE}" +TOOLCHAIN_TARGET_TASK:xilinx-standalone = "${@multilib_pkg_extend(d, 'packagegroup-newlib-standalone-sdk-target')}" diff --git a/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend index 0301c572..70a2f9da 100644 --- a/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend +++ b/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend @@ -2,9 +2,9 @@ COMPATIBLE_HOST = ".*-elf" COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi" # When building multiple, we need to depend on the multilib newlib -DEPENDS:append_xilinx-standalone = " ${MLPREFIX}newlib" +DEPENDS:append:xilinx-standalone = " ${MLPREFIX}newlib" -EXTRA_OECONF:append_xilinx-standalone = " \ +EXTRA_OECONF:append:xilinx-standalone = " \ --enable-newlib-io-c99-formats \ --enable-newlib-io-long-long \ --enable-newlib-io-float \ diff --git a/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend index 0d958f68..71590194 100644 --- a/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend +++ b/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend @@ -1,7 +1,7 @@ COMPATIBLE_HOST = ".*-elf" COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi" -EXTRA_OECONF:append_xilinx-standalone = " \ +EXTRA_OECONF:append:xilinx-standalone = " \ --enable-newlib-io-c99-formats \ --enable-newlib-io-long-long \ --enable-newlib-io-float \ @@ -9,12 +9,12 @@ EXTRA_OECONF:append_xilinx-standalone = " \ " # Avoid trimmping CCARGS from CC by newlib configure -do_configure:prepend_xilinx-standalone(){ +do_configure:prepend:xilinx-standalone(){ export CC_FOR_TARGET="${CC}" } # Fix for multilib newlib installations -do_install:prepend_xilinx-standalone() { +do_install:prepend:xilinx-standalone() { mkdir -p $(dirname ${D}${libdir}) mkdir -p $(dirname ${D}${includedir}) } diff --git a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend index 1df5430f..7ef0693b 100644 --- a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend +++ b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend @@ -5,7 +5,7 @@ GNUTCLINKS = "gnu-toolchain-canadian-${TARGET_SYS}" # Without the := the eval during do_package is occasionally missing multilibs -RDEPENDS:${PN}_xilinx-standalone := " \ +RDEPENDS:${PN}:xilinx-standalone := " \ ${@all_multilib_tune_values(d, 'GNUTCLINKS')} \ ${BINUTILS} \ ${GCC} \ -- cgit v1.2.3-54-g00ecf