* [master][PATCH 1/2] external-arm-sdk-toolchain: avoid clashing when doing multiple archs
@ 2020-05-06 18:14 Denys Dmytriyenko
2020-05-06 18:14 ` [master][PATCH 2/2] external-arm-toolchain-cross: drop hack for re-staging unwind.h Denys Dmytriyenko
0 siblings, 1 reply; 2+ messages in thread
From: Denys Dmytriyenko @ 2020-05-06 18:14 UTC (permalink / raw
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
This properly separates cross-canadian packages for multiple architectures
in a single build.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/conf/distro/include/toolchain-arm.inc | 6 +++---
| 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/meta-arago-distro/conf/distro/include/toolchain-arm.inc b/meta-arago-distro/conf/distro/include/toolchain-arm.inc
index fd63256..0ee0a4c 100644
--- a/meta-arago-distro/conf/distro/include/toolchain-arm.inc
+++ b/meta-arago-distro/conf/distro/include/toolchain-arm.inc
@@ -27,9 +27,9 @@ TOOLCHAIN_PREFIX := "${TOOLCHAIN_SYS}-"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-arm-toolchain"
-PREFERRED_PROVIDER_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "external-arm-sdk-toolchain"
-PREFERRED_PROVIDER_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "external-arm-sdk-toolchain"
-#PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "external-arm-sdk-toolchain"
+PREFERRED_PROVIDER_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "external-arm-sdk-toolchain-${TRANSLATED_TARGET_ARCH}"
+PREFERRED_PROVIDER_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "external-arm-sdk-toolchain-${TRANSLATED_TARGET_ARCH}"
+#PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "external-arm-sdk-toolchain-${TRANSLATED_TARGET_ARCH}"
# Special case for gdb to be built as part of canadian-cross-sdk, instead of packaged from external toolchain
bindir_pn-gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "${exec_prefix}/bin"
--git a/meta-arago-extras/recipes-core/meta/external-arm-sdk-toolchain.bb b/meta-arago-extras/recipes-core/meta/external-arm-sdk-toolchain.bb
index 45ae218..e432389 100644
--- a/meta-arago-extras/recipes-core/meta/external-arm-sdk-toolchain.bb
+++ b/meta-arago-extras/recipes-core/meta/external-arm-sdk-toolchain.bb
@@ -2,7 +2,10 @@ inherit cross-canadian
require external-arm-bfd-version.inc
-PR = "r8"
+PR = "r9"
+
+PN = "external-arm-sdk-toolchain-${TARGET_ARCH}"
+BPN = "external-arm-sdk-toolchain"
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
INHIBIT_PACKAGE_STRIP = "1"
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [master][PATCH 2/2] external-arm-toolchain-cross: drop hack for re-staging unwind.h
2020-05-06 18:14 [master][PATCH 1/2] external-arm-sdk-toolchain: avoid clashing when doing multiple archs Denys Dmytriyenko
@ 2020-05-06 18:14 ` Denys Dmytriyenko
0 siblings, 0 replies; 2+ messages in thread
From: Denys Dmytriyenko @ 2020-05-06 18:14 UTC (permalink / raw
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
This has been reworked, submitted and accepted upstream, drop locally.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-devtools/gcc/gcc_%.bbappend | 5 -----
.../meta/external-arm-toolchain-cross.bb | 21 ---------------------
2 files changed, 26 deletions(-)
delete mode 100644 meta-arago-distro/recipes-devtools/gcc/gcc_%.bbappend
delete mode 100644 meta-arago-extras/recipes-core/meta/external-arm-toolchain-cross.bb
diff --git a/meta-arago-distro/recipes-devtools/gcc/gcc_%.bbappend b/meta-arago-distro/recipes-devtools/gcc/gcc_%.bbappend
deleted file mode 100644
index 22a739e..0000000
--- a/meta-arago-distro/recipes-devtools/gcc/gcc_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-DEPENDS =+ "flex-native"
-
-EXTRA_DEPS = "${@['','external-linaro-toolchain-cross-${TARGET_ARCH}'][d.getVar('TOOLCHAIN_TYPE') == 'external' and d.getVar('TOOLCHAIN_BRAND') == 'linaro']}"
-EXTRA_DEPS = "${@['','external-arm-toolchain-cross-${TARGET_ARCH}'][d.getVar('TOOLCHAIN_TYPE') == 'external' and d.getVar('TOOLCHAIN_BRAND') == 'arm']}"
-DEPENDS += "${EXTRA_DEPS}"
diff --git a/meta-arago-extras/recipes-core/meta/external-arm-toolchain-cross.bb b/meta-arago-extras/recipes-core/meta/external-arm-toolchain-cross.bb
deleted file mode 100644
index d398ada..0000000
--- a/meta-arago-extras/recipes-core/meta/external-arm-toolchain-cross.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "Stage provided unwind.h header being used by target gcc installation"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-PR = "r1"
-
-inherit cross
-
-PN = "external-arm-toolchain-cross-${TARGET_ARCH}"
-BPN = "external-arm-toolchain"
-
-INHIBIT_DEFAULT_DEPS = "1"
-INHIBIT_AUTOTOOLS_DEPS = "1"
-
-TGT_VER_GCC = "${EAT_VER_GCC}"
-
-do_install() {
- install -d ${D}${libdir}/gcc/${TARGET_SYS}/${TGT_VER_GCC}/include/
- cp -a ${TOOLCHAIN_PATH}/lib/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/include/unwind.h ${D}/${libdir}/gcc/${TARGET_SYS}/${TGT_VER_GCC}/include/
-}
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-06 18:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-06 18:14 [master][PATCH 1/2] external-arm-sdk-toolchain: avoid clashing when doing multiple archs Denys Dmytriyenko
2020-05-06 18:14 ` [master][PATCH 2/2] external-arm-toolchain-cross: drop hack for re-staging unwind.h Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.