Skip to contentSkip to conversation

Minor tcmode-external-csl fixes

PATCH Applied Christopher Larson 2 participants 5 messages May 14, 2012 – May 16, 2012

lore
Share & tools
lore

Christopher Larson

author
#0 lore raw

cover Minor tcmode-external-csl fixes

From: Christopher Larson <[email protected]>

The following changes since commit 36d1717e2ad4ca1620ee9f01b524b5ff2f499b26:

classes/rootfs_*: fix splitting package dependency strings (2012-05-13 20:07:24 +0100)

are available in the git repository at:
https://github.com/kergoth/oe-core external-csl-minor-fixes

Christopher Larson (3):
tcmode-external-csl: drop unnecessary cppflags/ldflags
tcmode-external-csl: avoid hardcoding a list of ia32 archs
tcmode-external-csl: handle TUNE_PKGARCH=core2

 meta/conf/distro/include/tcmode-external-csl.inc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.7
author
#1 lore raw

PATCH 1/3 tcmode-external-csl: drop unnecessary cppflags/ldflags

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>
---
 meta/conf/distro/include/tcmode-external-csl.inc |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
meta/conf/distro/include/tcmode-external-csl.inc +0 -3
index 3b54e35..0a48658 100644
@@ -39,9 +39,6 @@ PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-csl-toolchain"
 GLIBC_INTERNAL_USE_BINARY_LOCALE = "precompiled"
 ENABLE_BINARY_LOCALE_GENERATION = ""
 
-TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include "
-TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib "
-
 TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}"
 
 # Translate to CodeSourcery's names for their optimized files in the toolchain
Signature · 1 line
1.7.7
author
#2 lore raw

PATCH 2/3 tcmode-external-csl: avoid hardcoding a list of ia32 archs

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>
---
 meta/conf/distro/include/tcmode-external-csl.inc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
meta/conf/distro/include/tcmode-external-csl.inc +4 -2
index 0a48658..deabd49 100644
@@ -70,7 +70,9 @@ python toolchain_metadata_setup () {
 
     d = e.data
 
-    if d.getVar('TUNE_PKGARCH', True) in ('i586', 'i686'):
+    l = d.createCopy()
+    l.finalize()
+    if os.path.exists(bb.data.expand('${EXTERNAL_TOOLCHAIN}/bin/gcc', l)):
         d.setVar('TOOLCHAIN_PATH_ADD', '')
 }
 addhandler toolchain_metadata_setup

@@ -81,7 +83,7 @@ python toolchain_setup () {
 
     d = e.data
 
-    if d.getVar('TUNE_PKGARCH', True) in ('i586', 'i686'):
+    if not d.getVar('TOOLCHAIN_PATH_ADD', True):
         populate_toolchain_links(d)
 }
 addhandler toolchain_setup
Signature · 1 line
1.7.7
author
#3 lore raw

PATCH 3/3 tcmode-external-csl: handle TUNE_PKGARCH=core2

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>
---
 meta/conf/distro/include/tcmode-external-csl.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta/conf/distro/include/tcmode-external-csl.inc +1 -0
index deabd49..11c5df5 100644
@@ -47,6 +47,7 @@ def csl_target_core(d):
         'armv7a-vfp-neon': 'armv7-a-neon',
         'i586': 'sgxx-glibc',
         'i686': 'sgxx-glibc',
+        'core2': 'sgxx-glibc',
         'mips': 'mips32',
         'mipsel': 'el',
         'powerpc-nf': 'nof',
Signature · 1 line
1.7.7
Applied
#4 lore raw
In reply to Christopher Larson
Quoted 9 lines · Christopher Larson

From: Christopher Larson<[email protected]>

The following changes since commit 36d1717e2ad4ca1620ee9f01b524b5ff2f499b26:

   classes/rootfs_*: fix splitting package dependency strings (2012-05-13 20:07:24 +0100)

are available in the git repository at:
https://github.com/kergoth/oe-core external-csl-minor-fixes

Quoted 8 lines

Christopher Larson (3):
tcmode-external-csl: drop unnecessary cppflags/ldflags
tcmode-external-csl: avoid hardcoding a list of ia32 archs
tcmode-external-csl: handle TUNE_PKGARCH=core2

  meta/conf/distro/include/tcmode-external-csl.inc |   10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)

Merged into OE-Core

Thanks
Sau!