Merge remote-tracking branch 'upstream/dunfell' into clang12

5 files changed, 28 insertions, 3 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 2f9d6f8..19e348b 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/chromium-browser-layer/*/*/*.bb \
-    browser-layer:${LAYERDIR}/dynamic-layers/chromium-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/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..ff82a79
--- /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"
+
+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-x11_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend
new file mode 100644
index 0000000..ff82a79
--- /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"
+
+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/gn-native_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend
new file mode 100644
index 0000000..cd60c58
--- /dev/null
+++ b/dynamic-layers/chromium-browser-layer/recipes-browser/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}"
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index e211258..c94dd69 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -25,7 +25,6 @@ SRC_URI = "\
     file://0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch \
     file://0015-clang-scan-view-needs-python-2.x.patch \
     file://0016-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch \
-    file://0017-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch \
     file://0018-Check-for-atomic-double-intrinsics.patch \
     file://0019-clang-Enable-SSP-and-PIE-by-default.patch \
     file://0020-libcxx-Add-compiler-runtime-library-to-link-step-for.patch \