diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-08-13 12:58:07 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-13 12:58:07 -0700 |
commit | e755276318e2bfbae891aef7a1edd0c9c03a5873 (patch) | |
tree | 83220afc6655d9040aef8ae42320562899b10929 | |
parent | c07d5568996a478c49c05d7a5b63d5a21377f3c2 (diff) | |
download | meta-clang-e755276318e2bfbae891aef7a1edd0c9c03a5873.tar.gz |
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 <raj.khem@gmail.com>
4 files changed, 20 insertions, 2 deletions
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" | |||
11 | LAYERDEPENDS_clang-layer = "core" | 11 | LAYERDEPENDS_clang-layer = "core" |
12 | 12 | ||
13 | BBFILES_DYNAMIC += " \ | 13 | BBFILES_DYNAMIC += " \ |
14 | browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*.bb \ | 14 | browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bb \ |
15 | browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*.bbappend \ | 15 | browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bbappend \ |
16 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ | 16 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ |
17 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ | 17 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ |
18 | networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ | 18 | 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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | DEPENDS_remove = "compiler-rt-native libcxx-native" | ||
4 | |||
5 | BUILD_CPPFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" | ||
6 | 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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | DEPENDS_remove = "compiler-rt-native libcxx-native" | ||
4 | |||
5 | BUILD_CPPFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" | ||
6 | 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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | DEPENDS_remove = "compiler-rt-native libcxx-native" | ||
4 | |||
5 | CXXFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" | ||
6 | LDFLAGS_remove = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" | ||