From f7cbf66ec2c487c2e754d9bfb4925db744df08bc Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Fri, 7 Oct 2022 15:18:08 +0800
Subject: sdk: Add support for adding icc to SDK

Also export ICC, ICCCXX, ICCCPP, ICCLD, ICCAR in SDK environment which can
then be used to compile applications in SDK

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 recipes-core/meta/icc-environment.inc                   | 17 +++++++++++++++++
 recipes-core/meta/meta-environment-extsdk.bbappend      |  4 ++++
 recipes-core/meta/meta-environment.bbappend             |  4 ++++
 .../nativesdk-packagegroup-sdk-host.bbappend            |  2 ++
 .../packagegroup-core-standalone-sdk-target.bbappend    |  2 ++
 5 files changed, 29 insertions(+)
 create mode 100644 recipes-core/meta/icc-environment.inc
 create mode 100644 recipes-core/meta/meta-environment-extsdk.bbappend
 create mode 100644 recipes-core/meta/meta-environment.bbappend
 create mode 100644 recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
 create mode 100644 recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend

diff --git a/recipes-core/meta/icc-environment.inc b/recipes-core/meta/icc-environment.inc
new file mode 100644
index 00000000..451b8a8c
--- /dev/null
+++ b/recipes-core/meta/icc-environment.inc
@@ -0,0 +1,17 @@
+export TARGET_ICC_ARCH = "${TARGET_CC_ARCH}"
+export ICCSDK_PREFIX_OPTION = "-gnu-prefix=${TARGET_PREFIX}"
+export ICCQSDK_PREFIX_OPTION = "-qgnu-prefix=${TARGET_PREFIX}"
+export ICCSDK_GCC_OPTION = "-gcc-name=${bindir}/${TARGET_PREFIX}gcc"
+export ICCSDK_GXX_OPTION = "-gxx-name=${bindir}/${TARGET_PREFIX}g++"
+
+create_sdk_files:append() {
+        script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
+        if ${@bb.utils.contains('ICCSDK', '1', 'true', 'false', d)}; then
+            echo 'export ICC="icc ${ICCSDK_PREFIX_OPTION} ${HOST_CC_ARCH} ${TARGET_ICC_ARCH} --sysroot=$SDKTARGETSYSROOT ${ICCSDK_GCC_OPTION}"' >> $script
+            echo 'export ICCCXX="icpc ${ICCSDK_PREFIX_OPTION} ${HOST_CC_ARCH} ${TARGET_ICC_ARCH} --sysroot=$SDKTARGETSYSROOT ${ICCSDK_GXX_OPTION}"' >> $script
+            echo 'export ICCCPP="icc ${ICCSDK_PREFIX_OPTION} -E ${HOST_CC_ARCH} ${TARGET_ICC_ARCH} --sysroot=$SDKTARGETSYSROOT ${ICCSDK_GXX_OPTION}"' >> $script
+            echo 'export ICCLD="xild  --sysroot=$SDKTARGETSYSROOT ${HOST_LD_ARCH}"' >> $script
+            echo 'export ICCCCLD="icc ${ICCSDK_PREFIX_OPTION} ${HOST_CC_ARCH} --sysroot=$SDKTARGETSYSROOT ${ICCSDK_GCC_OPTION}"' >> $script
+            echo 'export ICCAR="xiar"' >> $script
+        fi
+}
diff --git a/recipes-core/meta/meta-environment-extsdk.bbappend b/recipes-core/meta/meta-environment-extsdk.bbappend
new file mode 100644
index 00000000..31701d1f
--- /dev/null
+++ b/recipes-core/meta/meta-environment-extsdk.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+ICC_INC = "${@bb.utils.contains('ICCSDK', '1', 'icc-environment.inc', '', d)}"
+require ${ICC_INC}
diff --git a/recipes-core/meta/meta-environment.bbappend b/recipes-core/meta/meta-environment.bbappend
new file mode 100644
index 00000000..31701d1f
--- /dev/null
+++ b/recipes-core/meta/meta-environment.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+ICC_INC = "${@bb.utils.contains('ICCSDK', '1', 'icc-environment.inc', '', d)}"
+require ${ICC_INC}
diff --git a/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
new file mode 100644
index 00000000..93298d0d
--- /dev/null
+++ b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
@@ -0,0 +1,2 @@
+INTEL_COMPILER_COMMON_PKGS = "intel-oneapi-runtime-compilers intel-oneapi-runtime-compilers-staticdev intel-oneapi-runtime-compilers-dev"
+RDEPENDS:${PN} += "${@bb.utils.contains('ICCSDK', '1', ' ${INTEL_COMPILER_COMMON_PKGS} intel-oneapi-compiler-classic ', '', d)}"
diff --git a/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
new file mode 100644
index 00000000..b2dd25b7
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend
@@ -0,0 +1,2 @@
+INTEL_COMPILER_COMMON_PKGS = "intel-oneapi-runtime-compilers intel-oneapi-runtime-compilers-staticdev intel-oneapi-runtime-compilers-dev"
+RRECOMMENDS:${PN} += "${@bb.utils.contains('ICCSDK', '1', ' ${INTEL_COMPILER_COMMON_PKGS} intel-oneapi-compiler-classic ', '', d)}"
-- 
cgit v1.2.3-54-g00ecf