[gnome-build-meta/abderrahim/native-build: 8/8] sdk/WebKitGTK.bst: drop for workarounds for 32-bit builds




commit e62652e5c68a078300a964b7b26f2b67e62370d4
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Mon May 18 13:01:09 2020 +0100

    sdk/WebKitGTK.bst: drop for workarounds for 32-bit builds

 elements/sdk/webkit2gtk-4.1.bst | 1 -
 elements/sdk/webkit2gtk-5.0.bst | 1 -
 elements/sdk/webkitgtk.inc      | 6 ------
 files/webkitgtk/toolchain.arm   | 2 --
 files/webkitgtk/toolchain.i686  | 2 --
 5 files changed, 12 deletions(-)
---
diff --git a/elements/sdk/webkit2gtk-4.1.bst b/elements/sdk/webkit2gtk-4.1.bst
index f3c36fa5a..1e94c6f58 100644
--- a/elements/sdk/webkit2gtk-4.1.bst
+++ b/elements/sdk/webkit2gtk-4.1.bst
@@ -12,7 +12,6 @@ variables:
   cmake-local: >-
     -DPORT=GTK
     -DENABLE_WEBDRIVER=OFF
-    %{webkitgtk_toolchain}
 
 public:
   bst:
diff --git a/elements/sdk/webkit2gtk-5.0.bst b/elements/sdk/webkit2gtk-5.0.bst
index 0db05b292..0bfc21d04 100644
--- a/elements/sdk/webkit2gtk-5.0.bst
+++ b/elements/sdk/webkit2gtk-5.0.bst
@@ -12,7 +12,6 @@ variables:
   cmake-local: >-
     -DPORT=GTK
     -DUSE_GTK4=ON
-    %{webkitgtk_toolchain}
 
 public:
   bst:
diff --git a/elements/sdk/webkitgtk.inc b/elements/sdk/webkitgtk.inc
index ca2f35dac..8f6a4e425 100644
--- a/elements/sdk/webkitgtk.inc
+++ b/elements/sdk/webkitgtk.inc
@@ -3,10 +3,6 @@ sources:
   url: webkitgtk:webkitgtk-2.37.1.tar.xz
 - kind: patch
   path: files/webkitgtk/fix-cloop-build.patch
-- kind: local
-  path: files/webkitgtk/toolchain.i686
-- kind: local
-  path: files/webkitgtk/toolchain.arm
 
 build-depends:
 - sdk-deps/bubblewrap.bst
@@ -50,11 +46,9 @@ depends:
 
 variables:
   optimize-debug: 'false'
-  webkitgtk_toolchain: ''
   (?):
   - arch == "i686" or arch == "arm":
       debug_flags: "-g1"
-      webkitgtk_toolchain: -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain.%{arch}
 
 public:
   cpe:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]