[PATCH 0/8] Toolchain-related fixes

[PATCH 0/8] Toolchain-related fixes

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Series of toolchain-related fixes to pass the correct CC variable to the build,
instead of relying on the project's Makefile to set one up. This takes care of
using the right cross-compiler with all the required options, e.g. --sysroot,
and ensures correct builds with either external, or internal toolchain.

This has been developed and tested against master, but should also be applicable
to krogoth as well.

Denys Dmytriyenko (8):
  arm-benchmarks: fix build with any toolchain, pass CC var
  switch-config: fix build with any toolchain, pass CC var
  wlconf: fix build with any toolchain by using proper CC var
  am-sysinfo: fix build with any toolchain, pass CC var
  cpuloadgen: fix build with any toolchain, pass CC var
  eventdump: fix build with any toolchain, pass CC var
  omapconf: fix build with any toolchain, pass CC var
  screenshot: fix build with any toolchain, pass CC var

 .../recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb        | 8 +++-----
 meta-arago-extras/recipes-bsp/switch-config/switch-config_git.bb  | 4 ++--
 meta-arago-extras/recipes-connectivity/wlconf/wlconf.bb           | 4 ++--
 meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb       | 7 +++----
 meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb   | 4 ++--
 meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb     | 6 +++---
 meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb       | 6 +++---
 meta-arago-extras/recipes-graphics/screenshot/screenshot_1.0.bb   | 6 +++---
 8 files changed, 21 insertions(+), 24 deletions(-)

-- 
2.7.4

[PATCH 1/8] arm-benchmarks: fix build with any toolchain, pass CC var

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb        | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta-arago-extras/recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb b/meta-arago-extras/recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb
index 7e75a74..d167f08 100644
--- a/meta-arago-extras/recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb
+++ b/meta-arago-extras/recipes-benchmark/arm-benchmarks/arm-benchmarks_1.3.bb
@@ -1,10 +1,10 @@
-DESCRIPTION = "ARM Benchmarks"
+SUMMARY = "ARM Benchmarks"
 HOMEPAGE = "https://gforge.ti.com/gf/project/am_benchmarks/"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7aefb5e1cffc7b6a3ef18b803f957922"
 SECTION = "system"
 
-PR = "r11"
+PR = "r12"
 
 BRANCH ?= "master"
 SRCREV = "5bcbca9b3d75a6aa6d0e25132cc36a6ad2883de3"
@@ -14,14 +14,12 @@ SRC_URI = "git://git.ti.com/apps/arm_benchmarks.git;protocol=git;branch=${BRANCH
 S = "${WORKDIR}/git"
 
 do_compile() {
-
 	export CROSS_COMPILE=${TARGET_PREFIX}
 	export CFLAGS='${TARGET_CC_ARCH}'
 	# build the release version
-	oe_runmake release
+	oe_runmake release CC="${CC}"
 }
 do_install() {
 
 	oe_runmake DESTDIR=${D} install
 }
-
-- 
2.7.4

[PATCH 2/8] switch-config: fix build with any toolchain, pass CC var

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-extras/recipes-bsp/switch-config/switch-config_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arago-extras/recipes-bsp/switch-config/switch-config_git.bb b/meta-arago-extras/recipes-bsp/switch-config/switch-config_git.bb
index 2fd9d3b..7c8dc08 100644
--- a/meta-arago-extras/recipes-bsp/switch-config/switch-config_git.bb
+++ b/meta-arago-extras/recipes-bsp/switch-config/switch-config_git.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://switch-config.c;beginline=1;endline=14;md5=659ff9658cbaba3110b81804af60de75"
 
 PV = "2.0"
-PR = "r1"
+PR = "r2"
 
 BRANCH ?= "v4.1"
 SRCREV = "669334329dff132c4a093351d48252b12e995b6c"
@@ -12,7 +12,7 @@ SRC_URI = "git://git.ti.com/switch-config/switch-config.git;protocol=git;branch=
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}""
 
 do_configure() {
 	sed 's|-I$(KBUILD_OUTPUT)/usr/include|${TOOLCHAIN_OPTIONS} -I.|' -i ${S}/Makefile
-- 
2.7.4

[PATCH 3/8] wlconf: fix build with any toolchain by using proper CC var

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-extras/recipes-connectivity/wlconf/wlconf.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arago-extras/recipes-connectivity/wlconf/wlconf.bb b/meta-arago-extras/recipes-connectivity/wlconf/wlconf.bb
index 167ea43..625891c 100644
--- a/meta-arago-extras/recipes-connectivity/wlconf/wlconf.bb
+++ b/meta-arago-extras/recipes-connectivity/wlconf/wlconf.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85
 
 PV = "R8.6+git${SRCPV}"
 
-PR = "r4"
+PR = "r5"
 
 # Tag: R8.6
 SRCREV = "cf8965aad73764022669647fa33852558a657930"
@@ -12,7 +12,7 @@ SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git"
 
 S = "${WORKDIR}/git/wlconf"
 
-EXTRA_OEMAKE = "CC=${TARGET_PREFIX}gcc"
+EXTRA_OEMAKE = "CC="${CC}""
 
 do_install() {
 	install -d ${D}${bindir}
-- 
2.7.4

[PATCH 4/8] am-sysinfo: fix build with any toolchain, pass CC var

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb b/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb
index 0fa7366..207c24d 100644
--- a/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb
+++ b/meta-arago-extras/recipes-core/am-sysinfo/am-sysinfo_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "AM SysInfo"
+SUMMARY = "AM SysInfo"
 HOMEPAGE = "https://gforge.ti.com/gf/project/am_sysinfo/"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://mem_util/mem_util.c;beginline=1;endline=37;md5=8aa8e714ab729cfe8177298af8a5a25d"
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://mem_util/mem_util.c;beginline=1;endline=37;md5=8aa8e7
 SECTION = "system"
 
 PACKAGE_STRIP = "no"
-PR = "r9"
+PR = "r10"
 
 BRANCH ?= "master"
 SRCREV = "5df7da69a50d27b7f594db0918c5e6793c3a6237"
@@ -16,11 +16,10 @@ SRC_URI = "git://git.ti.com/apps/am_sysinfo.git;protocol=git;branch=${BRANCH}"
 S = "${WORKDIR}/git"
 
 do_compile() {
-
 	export CROSS_COMPILE=${TARGET_PREFIX}
 	export CFLAGS='${TARGET_CC_ARCH}'
 	# build the release version
-	oe_runmake release
+	oe_runmake release CC="${CC}"
 }
 
 do_install() {
-- 
2.7.4

[PATCH 5/8] cpuloadgen: fix build with any toolchain, pass CC var

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb b/meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb
index 99bc6a4..a792060 100644
--- a/meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb
+++ b/meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb
@@ -5,7 +5,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c6c2eb46c569d0cd7884089fea6b4f31"
 
 PV = "0.93"
-PR = "r0"
+PR = "r1"
 
 BRANCH ?= "master"
 SRCREV ?= "301d69899d6f4d84f143e0ed86957eea416a27a6"
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/ptitiano/cpuloadgen.git;protocol=git;branch=${BRANCH
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "DESTDIR=${D}${bindir} CROSS_COMPILE=${TARGET_PREFIX}"
+EXTRA_OEMAKE = "DESTDIR=${D}${bindir} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}""
 
 do_install () {
     install -d ${D}${bindir}
-- 
2.7.4

[PATCH 6/8] eventdump: fix build with any toolchain, pass CC var

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb b/meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb
index 7eabf25..d01833b 100644
--- a/meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb
+++ b/meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb
@@ -1,8 +1,8 @@
-DESCRIPTION = "Utility for parsing system events"
+SUMMARY = "Utility for parsing system events"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://eventdump.c;beginline=1;endline=34;md5=23b59be24a88ddc407b553035f3fd3e9"
 
-PR = "r2"
+PR = "r3"
 PV = "1.0+git${SRCPV}"
 
 SRCREV = "5db45a36a05a78ea44a4cb25312ed5ee3c2bd76d"
@@ -11,7 +11,7 @@ SRC_URI = "git://github.com/TI-ECS/eventdump.git;protocol=git"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} DEST_DIR=${D} BIN_DIR=${bindir}"
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} DEST_DIR=${D} BIN_DIR=${bindir} CC="${CC}""
 
 do_install() {
 	oe_runmake install
-- 
2.7.4

[PATCH 7/8] omapconf: fix build with any toolchain, pass CC var

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb b/meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb
index 697ef34..8ae572c 100644
--- a/meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb
+++ b/meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb
@@ -1,11 +1,11 @@
-DESCRIPTION = "Diagnostic tool for TI OMAP processors"
+SUMMARY = "Diagnostic tool for TI OMAP processors"
 HOMEPAGE = "https://github.com/omapconf/omapconf"
 
 LICENSE = "GPLv2 | BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=205c83c4e2242a765acb923fc766e914"
 
 PV = "1.73"
-PR = "r0"
+PR = "r1"
 
 COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|omap4"
 
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/omapconf/omapconf.git;protocol=git;branch=${BRANCH}"
 S = "${WORKDIR}/git"
 
 do_compile () {
-    oe_runmake CROSS_COMPILE=${TARGET_PREFIX} install
+    oe_runmake CC="${CC}" all
 }
 
 do_install () {
-- 
2.7.4

[PATCH 8/8] screenshot: fix build with any toolchain, pass CC var

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-extras/recipes-graphics/screenshot/screenshot_1.0.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-arago-extras/recipes-graphics/screenshot/screenshot_1.0.bb b/meta-arago-extras/recipes-graphics/screenshot/screenshot_1.0.bb
index c10dc25..d43ffd1 100644
--- a/meta-arago-extras/recipes-graphics/screenshot/screenshot_1.0.bb
+++ b/meta-arago-extras/recipes-graphics/screenshot/screenshot_1.0.bb
@@ -1,10 +1,10 @@
-DESCRIPTION = "Screenshot"
+SUMMARY = "Screenshot"
 HOMEPAGE = "https://gitorious.org/screenshot"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5cad16cc3f514a15adb1d710b82d5fc4"
 SECTION = "graphics"
 
-PR = "r1"
+PR = "r2"
 
 BRANCH ?= "master"
 SRCREV = "169242aa7a265d5c94755d74601ad4a3f1828c96"
@@ -17,7 +17,7 @@ do_compile() {
     export CROSS_COMPILE=${TARGET_PREFIX}
     export CFLAGS='${TARGET_CC_ARCH}'
     # build the release version
-    make release
+    make release CC="${CC}"
 }
 
 do_install() {
-- 
2.7.4