From 2619fb925b9c242973abda9bf4dc85d29c3a5836 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Thu, 27 Jul 2023 14:06:18 +0200 Subject: Remove chromium-browser-layer workarounds They seem to be necessary with clang 12. The recent cherry-picks have introduced native versions of the libc++ and libc++abi recipes, and I have managed to finish a full build of chromium-ozone-wayland-114.0.5735.198 without these changes. Signed-off-by: Raphael Kubo da Costa --- conf/layer.conf | 2 -- .../recipes-browser/chromium-ozone-wayland_%.bbappend | 10 ---------- .../recipes-browser/chromium-x11_%.bbappend | 10 ---------- .../recipes-browser/chromium/chromium-ozone-wayland_%.bbappend | 6 ------ .../recipes-browser/chromium/chromium-x11_%.bbappend | 6 ------ .../recipes-browser/chromium/gn-native_%.bbappend | 6 ------ .../recipes-browser/gn-native_%.bbappend | 6 ------ 7 files changed, 46 deletions(-) delete mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend delete mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend delete mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend delete mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend delete mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium/gn-native_%.bbappend delete mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend diff --git a/conf/layer.conf b/conf/layer.conf index 0736baf..2b81b64 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -11,8 +11,6 @@ LAYERSERIES_COMPAT_clang-layer = "dunfell hardknott honister" LAYERDEPENDS_clang-layer = "core" BBFILES_DYNAMIC += " \ - 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 deleted file mode 100644 index ff82a79..0000000 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index ff82a79..0000000 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -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/chromium-ozone-wayland_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend deleted file mode 100644 index 554578e..0000000 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index 554578e..0000000 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index cd60c58..0000000 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/gn-native_%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -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/dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend deleted file mode 100644 index cd60c58..0000000 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -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