From efab92a104e19f80727cf100c14473978d6aa62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 22 Jan 2024 11:07:53 +0100 Subject: [PATCH] package: Use tbb from buildroot --- .../configs/minikube_aarch64_defconfig | 1 + .../configs/minikube_x86_64_defconfig | 1 + deploy/iso/minikube-iso/package/Config.in | 1 - .../0001-tbb-Enable-cross-compilation.patch | 55 ------------------- deploy/iso/minikube-iso/package/tbb/Config.in | 16 ------ deploy/iso/minikube-iso/package/tbb/tbb.hash | 2 - deploy/iso/minikube-iso/package/tbb/tbb.mk | 39 ------------- 7 files changed, 2 insertions(+), 113 deletions(-) delete mode 100644 deploy/iso/minikube-iso/package/tbb/0001-tbb-Enable-cross-compilation.patch delete mode 100644 deploy/iso/minikube-iso/package/tbb/Config.in delete mode 100644 deploy/iso/minikube-iso/package/tbb/tbb.hash delete mode 100644 deploy/iso/minikube-iso/package/tbb/tbb.mk diff --git a/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig b/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig index 9f4761dc8d..534ddcb6b4 100644 --- a/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig @@ -114,3 +114,4 @@ BR2_PACKAGE_HOST_E2TOOLS=y BR2_PACKAGE_HOST_PYTHON=y BR2_PACKAGE_LIBFUSE=y BR2_PACKAGE_PAHOLE=y +BR2_PACKAGE_TBB=y diff --git a/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig b/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig index 7c5381a2e5..f815905301 100644 --- a/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig @@ -114,3 +114,4 @@ BR2_PACKAGE_HOST_E2TOOLS=y BR2_PACKAGE_HOST_PYTHON=y BR2_PACKAGE_LIBFUSE=y BR2_PACKAGE_PAHOLE=y +BR2_PACKAGE_TBB=y diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index dd0663e2c4..af82faa036 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -1,7 +1,6 @@ menu "System tools" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/package/tbb/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/sysdig/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni/Config.in" diff --git a/deploy/iso/minikube-iso/package/tbb/0001-tbb-Enable-cross-compilation.patch b/deploy/iso/minikube-iso/package/tbb/0001-tbb-Enable-cross-compilation.patch deleted file mode 100644 index 652d59c47b..0000000000 --- a/deploy/iso/minikube-iso/package/tbb/0001-tbb-Enable-cross-compilation.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 42c3faff14917f687aab405d8f571e352ffdf3f5 Mon Sep 17 00:00:00 2001 -From: Francis Laniel -Date: Wed, 6 Apr 2022 15:58:02 +0100 -Subject: [PATCH] tbb: Enable cross-compilation. - -This patch replaces hardcoded value for CPLUS and CONLY with $(CXX) and $(CC). -So, by defining CC= it is possible to cross compile this library using a -cross-compiler. - -This patch was originally written by: -Marcin Juszkiewicz -and taken from: -https://github.com/intel/luv-yocto/blob/3b0688bc9a5e8d52b6ca461b15fb4abd3eaaf7a8/meta-oe/recipes-support/tbb/tbb/cross-compile.patch - -Signed-off-by: Francis Laniel ---- - build/linux.clang.inc | 5 +++-- - build/linux.gcc.inc | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/build/linux.clang.inc b/build/linux.clang.inc -index 5a459ef5..a0777db5 100644 ---- a/build/linux.clang.inc -+++ b/build/linux.clang.inc -@@ -31,8 +31,9 @@ DYLIB_KEY = -shared - EXPORT_KEY = -Wl,--version-script, - LIBDL = -ldl - --CPLUS = clang++ --CONLY = clang -+CPLUS = $(CXX) -+CONLY = $(CC) -+CPLUS_FLAGS = $(CXXFLAGS) - LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) - LIBS += -lpthread -lrt - LINK_FLAGS = -Wl,-rpath-link=. -rdynamic -diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc -index 786c4153..30242a82 100644 ---- a/build/linux.gcc.inc -+++ b/build/linux.gcc.inc -@@ -32,8 +32,9 @@ DYLIB_KEY = -shared - EXPORT_KEY = -Wl,--version-script, - LIBDL = -ldl - --CPLUS = g++ --CONLY = gcc -+CPLUS = $(CXX) -+CONLY = $(CC) -+CPLUS_FLAGS = $(CXXFLAGS) - LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) - LIBS += -lpthread -lrt - LINK_FLAGS = -Wl,-rpath-link=. -rdynamic --- -2.25.1 - diff --git a/deploy/iso/minikube-iso/package/tbb/Config.in b/deploy/iso/minikube-iso/package/tbb/Config.in deleted file mode 100644 index 0f40b74d31..0000000000 --- a/deploy/iso/minikube-iso/package/tbb/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_TBB - bool "tbb" - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - help - Intel(R) Threading Building Blocks (Intel(R) TBB) lets you - easily write parallel C++ programs that take full advantage - of multicore performance, that are portable, composable and - have future-proof scalability. - - https://www.threadingbuildingblocks.org/ - -comment "tbb needs a glibc toolchain w/ dynamic library, threads, C++" - depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/deploy/iso/minikube-iso/package/tbb/tbb.hash b/deploy/iso/minikube-iso/package/tbb/tbb.hash deleted file mode 100644 index e9fb7511b8..0000000000 --- a/deploy/iso/minikube-iso/package/tbb/tbb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 b8dbab5aea2b70cf07844f86fa413e549e099aa3205b6a04059ca92ead93a372 tbb-2018_U5.tar.gz diff --git a/deploy/iso/minikube-iso/package/tbb/tbb.mk b/deploy/iso/minikube-iso/package/tbb/tbb.mk deleted file mode 100644 index cf06579b98..0000000000 --- a/deploy/iso/minikube-iso/package/tbb/tbb.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# tbb -# -################################################################################ - -TBB_VERSION = 2018_U5 -TBB_SITE = $(call github,01org,tbb,$(TBB_VERSION)) -TBB_INSTALL_STAGING = YES -TBB_LICENSE = Apache-2.0 -TBB_LICENSE_FILES = LICENSE - -TBB_SO_VERSION = 2 -TBB_LIBS = libtbb libtbbmalloc libtbbmalloc_proxy -TBB_BIN_PATH = $(@D)/build/linux_* - -define TBB_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) arch=$(BR2_ARCH) -C $(@D) -endef - -define TBB_INSTALL_LIBS - $(foreach lib,$(TBB_LIBS), - $(INSTALL) -D -m 0755 $(TBB_BIN_PATH)/$(lib).so.$(TBB_SO_VERSION) \ - $(1)/usr/lib/$(lib).so.$(TBB_SO_VERSION) ; - ln -sf $(lib).so.$(TBB_SO_VERSION) $(1)/usr/lib/$(lib).so - ) -endef - -define TBB_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/usr/include/ - cp -a $(@D)/include/* $(STAGING_DIR)/usr/include/ - $(call TBB_INSTALL_LIBS,$(STAGING_DIR)) -endef - -define TBB_INSTALL_TARGET_CMDS - $(call TBB_INSTALL_LIBS,$(TARGET_DIR)) -endef - -$(eval $(generic-package))