[gnome-build-meta/abderrahim/includes: 3/4] use more include files from freedesktop-sdk

[Marge Bot <marge-bot src gnome org>]

commit 70ed391ee645250b6447b2adfc9e868e4fb19ba4
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sat Mar 5 16:57:50 2022 +0100

    use more include files from freedesktop-sdk
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1548>

 elements/sdk/webkitgtk.inc | 11 +----------
 project.conf               | 43 +------------------------------------------
 2 files changed, 2 insertions(+), 52 deletions(-)
---
diff --git a/elements/sdk/webkitgtk.inc b/elements/sdk/webkitgtk.inc
index 6291585a2..dff591c4a 100644
--- a/elements/sdk/webkitgtk.inc
+++ b/elements/sdk/webkitgtk.inc
@@ -52,18 +52,9 @@ variables:
   webkitgtk_toolchain: ''
   (?):
   - arch == "i686" or arch == "arm":
+      debug_flags: "-g1"
       webkitgtk_toolchain: -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain.%{arch}
 
-(?):
-- arch == "i686":
-    environment:
-      CFLAGS: '%{flags_i686} -g1'
-      CXXFLAGS: '%{flags_i686} -g1'
-- arch == "arm":
-    environment:
-      CFLAGS: '%{flags_arm} -g1'
-      CXXFLAGS: '%{flags_arm} -g1'
-
 public:
   cpe:
     product: webkitgtk+
diff --git a/project.conf b/project.conf
index 975f96d24..c98a804c6 100644
--- a/project.conf
+++ b/project.conf
@@ -18,7 +18,7 @@ fatal-warnings:
 - overlaps
 
 (@):
-- freedesktop-sdk.bst:include/strip.yml
+- freedesktop-sdk.bst:include/runtime.yml
 - include/aliases.yml
 - include/mirrors.yml
 
@@ -48,22 +48,7 @@ options:
 environment:
   LC_ALL: en_US.UTF-8
   (?):
-  - arch == "x86_64":
-      CFLAGS: "%{flags_x86_64}"
-      CXXFLAGS: "%{flags_x86_64}"
-      LDFLAGS: "%{ldflags_defaults}"
-  - arch == "i686":
-      CFLAGS: "%{flags_i686}"
-      CXXFLAGS: "%{flags_i686}"
-      LDFLAGS: "%{ldflags_defaults}"
-  - arch == "arm":
-      CFLAGS: "%{flags_arm}"
-      CXXFLAGS: "%{flags_arm}"
-      LDFLAGS: "%{ldflags_defaults}"
   - arch == "aarch64":
-      CFLAGS: "%{flags_aarch64}"
-      CXXFLAGS: "%{flags_aarch64}"
-      LDFLAGS: "%{ldflags_defaults}"
       # Our aarch64 CI runner uses CentOS, which uses 64 KB page sizes, but we do not
       # want to support large pages in WebKit as this requires disabling both JIT and
       # bmalloc, including all heap security features. As a workaround until the CI
@@ -74,14 +59,7 @@ environment:
       # when the aarch64 CI no longer uses CentOS.
       JavaScriptCoreUseJIT: '0'
       Malloc: '1'
-  - arch == "ppc64le":
-      CFLAGS: "%{flags_ppc64le}"
-      CXXFLAGS: "%{flags_ppc64le}"
-      LDFLAGS: "%{ldflags_defaults}"
   - arch == "riscv64":
-      CFLAGS: "%{flags_riscv64}"
-      CXXFLAGS: "%{flags_riscv64}"
-      LDFLAGS: "%{ldflags_defaults}"
       G_SLICE: always-malloc
 
 (?):
@@ -276,26 +254,7 @@ variables:
   ostree-layer: user
   ostree-branch: "gnome-os/%{branch}/%{arch}-%{ostree-layer}"
   ostree-remote-url: "https://ostree.gnome.org/repo";
-  gcc_arch: "%{arch}"
-  abi: "gnu"
-  gcc_triplet: "%{gcc_arch}-linux-%{abi}"
-  triplet: "%{arch}-unknown-linux-%{abi}"
-  lib: "lib/%{gcc_triplet}"
-  sbindir: "%{bindir}"
-  sysconfdir: "/etc"
-  localstatedir: "/var"
-  indep-libdir: "%{prefix}/lib"
-  debugdir: "%{indep-libdir}/debug"
   runstatedir: "/run"
-  common_flags: "-O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions 
-fstack-protector-strong -grecord-gcc-switches"
-  flags_x86_64: "-march=x86-64 -mtune=generic %{common_flags} -fasynchronous-unwind-tables 
-fstack-clash-protection -fcf-protection -fno-omit-frame-pointer %{local_flags}"
-  flags_i686: "-march=i686 -mtune=generic -msse2 -mfpmath=sse -mstackrealign %{common_flags} 
-fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection %{local_flags}"
-  flags_aarch64: "%{common_flags} -fasynchronous-unwind-tables -fstack-clash-protection 
-fno-omit-frame-pointer %{local_flags}"
-  flags_arm: "%{common_flags} %{local_flags}"
-  flags_ppc64le: "%{common_flags} -mcpu=power9 -mtune=power9 -fno-omit-frame-pointer %{local_flags}"
-  flags_riscv64: "%{common_flags} -fasynchronous-unwind-tables -fstack-clash-protection %{local_flags}"
-  ldflags_defaults: "-Wl,-z,relro,-z,now -Wl,--as-needed -L%{libdir}"
-  local_flags: ''
 
   (?):
   - arch == "x86_64":