From e755276318e2bfbae891aef7a1edd0c9c03a5873 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 13 Aug 2021 12:58:07 -0700 Subject: chromium,gn: Do not depend on libc++ native recipes Master meta-browser has moved away from gcc completely even for native portions, but those changes require master branch of meta-clang as well for older layers where older than clang 13 is used, lets undo those changes Signed-off-by: Khem Raj --- conf/layer.conf | 4 ++-- .../recipes-browser/chromium/chromium-ozone-wayland_%.bbappend | 6 ++++++ .../recipes-browser/chromium/chromium-x11_%.bbappend | 6 ++++++ .../recipes-browser/chromium/gn-native_%.bbappend | 6 ++++++ 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend create mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend create mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium/gn-native_%.bbappend diff --git a/conf/layer.conf b/conf/layer.conf index fc1d047..c095b30 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -11,8 +11,8 @@ LAYERSERIES_COMPAT_clang-layer = "dunfell hardknott honister" LAYERDEPENDS_clang-layer = "core" BBFILES_DYNAMIC += " \ - browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*.bb \ - browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*.bbappend \ + browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bb \ + 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/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend new file mode 100644 index 0000000..554578e --- /dev/null +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +DEPENDS_remove = "compiler-rt-native libcxx-native" + +BUILD_CPPFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" +BUILD_LDFLAGS_remove = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend new file mode 100644 index 0000000..554578e --- /dev/null +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +DEPENDS_remove = "compiler-rt-native libcxx-native" + +BUILD_CPPFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" +BUILD_LDFLAGS_remove = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/gn-native_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/gn-native_%.bbappend new file mode 100644 index 0000000..cd60c58 --- /dev/null +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/gn-native_%.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +DEPENDS_remove = "compiler-rt-native libcxx-native" + +CXXFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" +LDFLAGS_remove = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" -- cgit v1.2.3-54-g00ecf