From 2c58fe0867f8ca895ec43a9b8855323b7331e8d9 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Tue, 22 Nov 2022 16:42:15 +0800 Subject: icc: drop Intel C++ classic compiler support Support for Intel(R) oneAPI DPC++/C++ (icx) compiler is being added. So remove the support for the classic compiler. Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- classes/icc.bbclass | 43 ---------------- conf/layer.conf | 3 -- conf/noniccable.conf | 54 -------------------- .../intel-oneapi-compiler-classic_2022.1.0-3768.bb | 34 ------------- ...intel-oneapi-runtime-compilers_2022.1.0-3768.bb | 59 ---------------------- 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 - ...ackagegroup-core-standalone-sdk-target.bbappend | 2 - 10 files changed, 222 deletions(-) delete mode 100644 classes/icc.bbclass delete mode 100644 conf/noniccable.conf delete mode 100644 dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler-classic_2022.1.0-3768.bb delete mode 100644 dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-runtime-compilers_2022.1.0-3768.bb delete mode 100644 recipes-core/meta/icc-environment.inc delete mode 100644 recipes-core/meta/meta-environment-extsdk.bbappend delete mode 100644 recipes-core/meta/meta-environment.bbappend delete mode 100644 recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend delete mode 100644 recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend diff --git a/classes/icc.bbclass b/classes/icc.bbclass deleted file mode 100644 index b2a85bcf..00000000 --- a/classes/icc.bbclass +++ /dev/null @@ -1,43 +0,0 @@ -TOOLCHAINOVERRIDES = ":toolchain-${TOOLCHAIN}" -TOOLCHAINOVERRIDES[vardepsexclude] = "TOOLCHAIN" - -OVERRIDES .= "${TOOLCHAINOVERRIDES}" -OVERRIDES[vardepsexclude] += "TOOLCHAINOVERRIDES" - -ICC_PREFIX_OPTION = "" -ICCQ_PREFIX_OPTION = "" - -python(){ - hostprefix = d.getVar('HOST_PREFIX', True) - if hostprefix and hostprefix != "": - d.setVar("ICC_PREFIX_OPTION", "-gnu-prefix=${HOST_PREFIX}") - d.setVar("ICCQ_PREFIX_OPTION","-qgnu-prefix=${HOST_PREFIX}") - else: - d.setVar("ICC_PREFIX_OPTION", "") - d.setVar("ICCQ_PREFIX_OPTION","") - -} - -ICC_GCC_OPTION = "-gcc-name=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}gcc" -ICC_GXX_OPTION = "-gxx-name=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}g++" -CC:toolchain-icc = "icc ${ICC_PREFIX_OPTION} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${ICC_GCC_OPTION}" -CXX:toolchain-icc = "icpc ${ICC_PREFIX_OPTION} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${ICC_GXX_OPTION}" -CPP:toolchain-icc = "icc ${ICC_PREFIX_OPTION} -E${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH} ${ICC_GXX_OPTION}" -LD:toolchain-icc = "xild ${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}" -CCLD:toolchain-icc = "icc ${ICC_PREFIX_OPTION} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${ICC_GCC_OPTION}" -AR:toolchain-icc = "xiar" - -DEBUG_FLAGS=" -g -feliminate-unused-debug-types" -TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE} ${ASNEEDED}" -CFLAGS:append:toolchain-icc = " ${ICC_PREFIX_OPTION}" -CXXFLAGS:append:toolchain-icc = " ${ICC_PREFIX_OPTION}" - -OECMAKE_AR:toolchain-icc = "${AR}" - -DEPENDS:append:toolchain-icc:class-target = " intel-oneapi-runtime-compilers" -DEPENDS:append:toolchain-icc:class-target = " intel-oneapi-compiler-classic-native" -TOOLCHAIN:class-native = "gcc" -TOOLCHAIN:class-nativesdk = "gcc" -TOOLCHAIN:class-cross-canadian = "gcc" -TOOLCHAIN:class-crosssdk = "gcc" -TOOLCHAIN:class-cross = "gcc" diff --git a/conf/layer.conf b/conf/layer.conf index a226ddcf..77baa827 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -41,6 +41,3 @@ PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva" PREFERRED_PROVIDER_libva-utils ?= "libva-utils" PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native" PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" - -# Do not include icc in SDK unless user wants to. -ICCSDK ??= "0" diff --git a/conf/noniccable.conf b/conf/noniccable.conf deleted file mode 100644 index ca526160..00000000 --- a/conf/noniccable.conf +++ /dev/null @@ -1,54 +0,0 @@ -# Per package toolchain configuration -# specify the icc build package here: - -#force enable the default gcc build for the following packages -TOOLCHAIN:pn-intel-oneapi-compiler = 'gcc' -TOOLCHAIN:pn-gcc = "gcc" -TOOLCHAIN:pn-gcc-cross = "gcc" -TOOLCHAIN:pn-libgcc-initial = "gcc" -TOOLCHAIN:pn-libgcc = "gcc" -TOOLCHAIN:pn-gcc-runtime = "gcc" -TOOLCHAIN:pn-gcc-sanitizers = "gcc" -TOOLCHAIN:pn-glibc = "gcc" -TOOLCHAIN:pn-glibc-initial = "gcc" -TOOLCHAIN:pn-glibc-locale = "gcc" -TOOLCHAIN:pn-glibc-mtrace = "gcc" -TOOLCHAIN:pn-glibc-scripts = "gcc" -TOOLCHAIN:pn-glibc-testsuite = "gcc" -TOOLCHAIN:pn-grub = "gcc" -TOOLCHAIN:pn-grub-efi = "gcc" -TOOLCHAIN:pn-opkg-utils = "gcc" -TOOLCHAIN:pn-binutils-cross = "gcc" -TOOLCHAIN:pn-intel-oneapi-runtime-compilers = "gcc" -TOOLCHAIN:pn-intel-oneapi-runtime-compilers-native = 'gcc' -TOOLCHAIN:pn-intel-oneapi-compiler-classic = "gcc" - - -TOOLCHAIN:pn-gnu-efi = 'gcc' -TOOLCHAIN:pn-libgpg-error = 'gcc' -TOOLCHAIN:pn-systemd-boot = 'gcc' -TOOLCHAIN:pn-gdb = 'gcc' -TOOLCHAIN:pn-zstd = 'gcc' -TOOLCHAIN:pn-ocl-icd = 'gcc' -TOOLCHAIN:pn-xz = 'gcc' -TOOLCHAIN:pn-libffi = 'gcc' -TOOLCHAIN:pn-libxcrypt = 'gcc' -TOOLCHAIN:pn-libpcre = 'gcc' -TOOLCHAIN:pn-icu = 'gcc' -TOOLCHAIN:pn-curl = 'gcc' -TOOLCHAIN:pn-python3 = "gcc" -TOOLCHAIN:pn-syslinux = "gcc" -TOOLCHAIN:pn-diffutils = "gcc" -TOOLCHAIN:pn-elfutils = "gcc" -TOOLCHAIN:pn-gawk = "gcc" -TOOLCHAIN:pn-coreutils = "gcc" -TOOLCHAIN:pn-findutils = "gcc" -TOOLCHAIN:pn-grep = "gcc" - -#TODO Fix it -# ../glib-2.72.3/meson.build:1:0: ERROR: Compiler icpc .... can not compile programs. -TOOLCHAIN:pn-glib-2.0 = 'gcc' - -# do_package_qa: QA Issue: package contains bad RPATH -TOOLCHAIN:pn-shared-mime-info = 'gcc' -TOOLCHAIN:pn-gobject-introspection = 'gcc' diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler-classic_2022.1.0-3768.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler-classic_2022.1.0-3768.bb deleted file mode 100644 index db9fd730..00000000 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler-classic_2022.1.0-3768.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Intel® C++ Compiler Classic" - -DESCRIPTION = "Intel® C++ Compiler Classic generates applications \ -that can run on Intel® 64 architecture." - -HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/documentation/cpp-compiler-developer-guide-and-reference/top/introducing-the-intel-c-compiler-classic.html" - -LICENSE="EULA" - -LIC_FILES_CHKSUM = " \ - file://opt/intel/oneapi/licensing/2022.1.0/license.htm;md5=f721d37d5ef65590e052bc47e15feec3 \ - " - -SRC_URI = " \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-2022.1.0-${PV}_amd64.deb;subdir=${BPN};name=classic-compiler \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-licensing-2022.1.0-2022.1.0-161_all.deb;subdir=${BPN};name=license \ - " - -SRC_URI[classic-compiler.sha256sum] = "0407cf12127f641f1e1b50e8e8e3c6c9cd27be40b849d697401fa8c140604c23" -SRC_URI[license.sha256sum] = "30f36ef653964ac629ce77c2c2d21a923c7ba4ff88936c39a8f39237b7446cca" - -S = "${WORKDIR}/${BPN}" - -inherit bin_package update-alternatives -RDEPENDS:${PN} += " intel-oneapi-runtime-compilers" - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" - -do_install () { - install -d ${D}/${bindir}/ - cp -r ${S}/opt/intel/oneapi/compiler/2022.1.0/linux/bin/intel64/* ${D}${bindir}/ -} -BBCLASSEXTEND = "native nativesdk" diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-runtime-compilers_2022.1.0-3768.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-runtime-compilers_2022.1.0-3768.bb deleted file mode 100644 index 0faf277d..00000000 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-runtime-compilers_2022.1.0-3768.bb +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "Intel® C++ Compiler Classic runtime common files" - -DESCRIPTION = "Intel® C++ Compiler Classic generates applications \ -that can run on Intel® 64 architecture." - -HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/documentation/cpp-compiler-developer-guide-and-reference/top/introducing-the-intel-c-compiler-classic.html" - -LICENSE="EULA" - -LIC_FILES_CHKSUM = " \ - file://opt/intel/oneapi/lib/licensing/compiler/Intel%20Developer%20Tools%20EULA;md5=7bfc91523de2e84e7131d0eacf2827d4 \ - " - -SRC_URI = " \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-compilers-${PV}_amd64.deb;subdir=${BPN};name=runtime-compilers \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-compilers-common-${PV}_all.deb;subdir=${BPN};name=common-compilers \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-classic-fortran-shared-runtime-2022.1.0-${PV}_amd64.deb;subdir=${BPN};name=shared-runtime \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-2022.1.0-${PV}_amd64.deb;subdir=${BPN};name=compiler-linker \ - https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-common-2022.1.0-${PV}_all.deb;subdir=${BPN};name=dpcpp-common \ - " - -SRC_URI[runtime-compilers.sha256sum] = "0f27cbde635f30e79329248398e36e5610aa78aeda4ebc9ed1f3538ffbf0ea8d" -SRC_URI[common-compilers.sha256sum] = "7347588844ad9e86291586c049185381ec960cde09b6fd220c626fb865f8865c" -SRC_URI[shared-runtime.sha256sum] = "77b7201b5fe991152528ec40d586114edef12bb79c1a1a8fbfd6bd23c2aba5e1" -SRC_URI[compiler-linker.sha256sum] = "3185dc02473b3d3a34234dd82a17c285e43701455636f93be235b52c2ac6f2c6" -SRC_URI[dpcpp-common.sha256sum] = "5bc6452a32f5781c96498515d061d8fe9d7bba13b41eb983fe9bb0f792621906" - -S = "${WORKDIR}/${BPN}" - -inherit bin_package update-alternatives - -RDEPENDS:${PN} += " ocl-icd zlib" - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" - -# doesn't have GNU_HASH (didn't pass LDFLAGS?) -INSANE_SKIP:${PN} += "textrel dev-so dev-elf ldflags" -FILES_SOLIBSDEV = "" - - -do_install () { - install -d ${D}${libdir}/ - install -d ${D}${bindir}/ - install -d ${D}${libdir}/licensing/compiler/ - cp -r ${S}/opt/intel/oneapi/compiler/2022.1.0/linux/bin/intel64/* ${D}${bindir}/ - cp -r ${S}/opt/intel/oneapi/lib/intel64/*.so* ${D}${libdir}/ - cp -r ${S}/opt/intel/oneapi/lib/*.so* ${D}${libdir}/ - cp -r ${S}/opt/intel/oneapi/lib/*.a ${D}${libdir}/ - cp -r ${S}/opt/intel/oneapi/lib/libsycl-fallback-cstring.o ${D}${libdir}/ - cp -r ${S}/opt/intel/oneapi/lib/libsycl-fallback-cstring.spv ${D}${libdir}/ - cp -r ${S}/opt/intel/oneapi/lib/licensing/compiler/* ${D}${libdir}/licensing/compiler/ - cp -r ${S}/opt/intel/oneapi/compiler/2022.1.0/linux/compiler/lib/intel64_lin/* ${D}${libdir}/ - cp -r ${S}/opt/intel/oneapi/compiler/2022.1.0/linux/lib/clang ${D}${libdir}/ - rm -rf ${D}/${bindir}/*.so* - rm -rf ${D}/opt -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-core/meta/icc-environment.inc b/recipes-core/meta/icc-environment.inc deleted file mode 100644 index 451b8a8c..00000000 --- a/recipes-core/meta/icc-environment.inc +++ /dev/null @@ -1,17 +0,0 @@ -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 deleted file mode 100644 index 31701d1f..00000000 --- a/recipes-core/meta/meta-environment-extsdk.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 31701d1f..00000000 --- a/recipes-core/meta/meta-environment.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 93298d0d..00000000 --- a/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 329a9244..00000000 --- a/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -INTEL_COMPILER_COMMON_PKGS = "intel-oneapi-runtime-compilers intel-oneapi-runtime-compilers-staticdev intel-oneapi-runtime-compilers-dev" -RRECOMMENDS:${PN}:append:intel-x86-common = "${@bb.utils.contains('ICCSDK', '1', ' ${INTEL_COMPILER_COMMON_PKGS} intel-oneapi-compiler-classic', '', d)}" -- cgit v1.2.3-54-g00ecf