From a8b94b0a778da4a4b9547401c71a908abec4e803 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 13 Aug 2021 08:51:40 -0700 Subject: chromium,gn-native: Remove dependency on native libc++ native versions of libcxx and compiler-rt are only available in honister and newer Signed-off-by: Khem Raj --- conf/layer.conf | 4 ++-- .../recipes-browser/chromium-ozone-wayland_%.bbappend | 5 ----- .../browser-layer/recipes-browser/chromium-x11_%.bbappend | 5 ----- .../recipes-browser/chromium-ozone-wayland_%.bbappend | 10 ++++++++++ .../recipes-browser/chromium-x11_%.bbappend | 10 ++++++++++ .../recipes-browser/gn-native_%.bbappend | 6 ++++++ 6 files changed, 28 insertions(+), 12 deletions(-) delete mode 100644 dynamic-layers/browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend delete mode 100644 dynamic-layers/browser-layer/recipes-browser/chromium-x11_%.bbappend create mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend create mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend create mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend diff --git a/conf/layer.conf b/conf/layer.conf index c0a422f..fdea56c 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -11,8 +11,8 @@ LAYERSERIES_COMPAT_clang-layer = "zeus dunfell" LAYERDEPENDS_clang-layer = "core" BBFILES_DYNAMIC += " \ - browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*.bb \ - browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*.bbappend \ + chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*.bb \ + chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*.bbappend \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend b/dynamic-layers/browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend deleted file mode 100644 index 1805554..0000000 --- a/dynamic-layers/browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -GN_ARGS += "use_lld=true use_gold=false" - -UNWINDLIB_toolchain-clang = "--unwindlib=libgcc" diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium-x11_%.bbappend b/dynamic-layers/browser-layer/recipes-browser/chromium-x11_%.bbappend deleted file mode 100644 index 1805554..0000000 --- a/dynamic-layers/browser-layer/recipes-browser/chromium-x11_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -GN_ARGS += "use_lld=true use_gold=false" - -UNWINDLIB_toolchain-clang = "--unwindlib=libgcc" diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend new file mode 100644 index 0000000..e6c0d5c --- /dev/null +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +GN_ARGS += "use_lld=true use_gold=false" + +UNWINDLIB_toolchain-clang = "--unwindlib=libgcc" + +DEPEND_remove_runtime-llvm = "compiler-rt-native libcxx-native" + +BUILD_CPPFLAGS_remove_rumtime-llvm = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" +BUILD_LDFLAGS_remove_runtime-llvm = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend new file mode 100644 index 0000000..e6c0d5c --- /dev/null +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +GN_ARGS += "use_lld=true use_gold=false" + +UNWINDLIB_toolchain-clang = "--unwindlib=libgcc" + +DEPEND_remove_runtime-llvm = "compiler-rt-native libcxx-native" + +BUILD_CPPFLAGS_remove_rumtime-llvm = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" +BUILD_LDFLAGS_remove_runtime-llvm = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend new file mode 100644 index 0000000..9fcb978 --- /dev/null +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +DEPEND_remove_runtime-llvm = "compiler-rt-native libcxx-native" + +BUILD_CPPFLAGS_remove_rumtime-llvm = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" +BUILD_LDFLAGS_remove_runtime-llvm = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" -- cgit v1.2.3-54-g00ecf