summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-standalone/recipes-core
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2021-10-14 07:46:23 -0700
committerMark Hatle <mark.hatle@xilinx.com>2021-10-25 14:57:25 -0700
commitbe068fec4927666ad84f8955b8cf65e9e25e837f (patch)
tree2a40d1b8c5cf3dfe03fd665e6eab5acca836134c /meta-xilinx-standalone/recipes-core
parent69e5048019d5e8bd0b57f61ed4238083d947c217 (diff)
downloadmeta-xilinx-be068fec4927666ad84f8955b8cf65e9e25e837f.tar.gz
meta-xilinx-standalone: various fixes for override syntax changes
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-standalone/recipes-core')
-rw-r--r--meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend4
-rw-r--r--meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend4
-rw-r--r--meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend6
-rw-r--r--meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend2
4 files changed, 8 insertions, 8 deletions
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 = " \
8 nativesdk-sdk-provides-dummy \ 8 nativesdk-sdk-provides-dummy \
9" 9"
10 10
11TOOLCHAIN_HOST_TASK_xilinx-standalone = "${HOST_DEPENDS} packagegroup-cross-canadian-${MACHINE}" 11TOOLCHAIN_HOST_TASK:xilinx-standalone = "${HOST_DEPENDS} packagegroup-cross-canadian-${MACHINE}"
12TOOLCHAIN_TARGET_TASK_xilinx-standalone = "${@multilib_pkg_extend(d, 'packagegroup-newlib-standalone-sdk-target')}" 12TOOLCHAIN_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"
2COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi" 2COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi"
3 3
4# When building multiple, we need to depend on the multilib newlib 4# When building multiple, we need to depend on the multilib newlib
5DEPENDS:append_xilinx-standalone = " ${MLPREFIX}newlib" 5DEPENDS:append:xilinx-standalone = " ${MLPREFIX}newlib"
6 6
7EXTRA_OECONF:append_xilinx-standalone = " \ 7EXTRA_OECONF:append:xilinx-standalone = " \
8 --enable-newlib-io-c99-formats \ 8 --enable-newlib-io-c99-formats \
9 --enable-newlib-io-long-long \ 9 --enable-newlib-io-long-long \
10 --enable-newlib-io-float \ 10 --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 @@
1COMPATIBLE_HOST = ".*-elf" 1COMPATIBLE_HOST = ".*-elf"
2COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi" 2COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi"
3 3
4EXTRA_OECONF:append_xilinx-standalone = " \ 4EXTRA_OECONF:append:xilinx-standalone = " \
5 --enable-newlib-io-c99-formats \ 5 --enable-newlib-io-c99-formats \
6 --enable-newlib-io-long-long \ 6 --enable-newlib-io-long-long \
7 --enable-newlib-io-float \ 7 --enable-newlib-io-float \
@@ -9,12 +9,12 @@ EXTRA_OECONF:append_xilinx-standalone = " \
9" 9"
10 10
11# Avoid trimmping CCARGS from CC by newlib configure 11# Avoid trimmping CCARGS from CC by newlib configure
12do_configure:prepend_xilinx-standalone(){ 12do_configure:prepend:xilinx-standalone(){
13 export CC_FOR_TARGET="${CC}" 13 export CC_FOR_TARGET="${CC}"
14} 14}
15 15
16# Fix for multilib newlib installations 16# Fix for multilib newlib installations
17do_install:prepend_xilinx-standalone() { 17do_install:prepend:xilinx-standalone() {
18 mkdir -p $(dirname ${D}${libdir}) 18 mkdir -p $(dirname ${D}${libdir})
19 mkdir -p $(dirname ${D}${includedir}) 19 mkdir -p $(dirname ${D}${includedir})
20} 20}
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 @@
5GNUTCLINKS = "gnu-toolchain-canadian-${TARGET_SYS}" 5GNUTCLINKS = "gnu-toolchain-canadian-${TARGET_SYS}"
6 6
7# Without the := the eval during do_package is occasionally missing multilibs 7# Without the := the eval during do_package is occasionally missing multilibs
8RDEPENDS:${PN}_xilinx-standalone := " \ 8RDEPENDS:${PN}:xilinx-standalone := " \
9 ${@all_multilib_tune_values(d, 'GNUTCLINKS')} \ 9 ${@all_multilib_tune_values(d, 'GNUTCLINKS')} \
10 ${BINUTILS} \ 10 ${BINUTILS} \
11 ${GCC} \ 11 ${GCC} \