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




commit aa3a4c781b1e861de324e7ad279ae7e4c8af0fdb
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
    
    Fixes #76

 elements/sdk/webkitgtk.bst     | 10 +++-------
 files/webkitgtk/toolchain.arm  |  2 --
 files/webkitgtk/toolchain.i686 |  2 --
 3 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/elements/sdk/webkitgtk.bst b/elements/sdk/webkitgtk.bst
index 2928762e..3251acb3 100644
--- a/elements/sdk/webkitgtk.bst
+++ b/elements/sdk/webkitgtk.bst
@@ -3,10 +3,6 @@ kind: cmake
 sources:
 - kind: tar
   url: webkitgtk_org:webkitgtk-2.30.3.tar.xz
-- kind: local
-  path: files/webkitgtk/toolchain.i686
-- kind: local
-  path: files/webkitgtk/toolchain.arm
 
 build-depends:
 - sdk-deps/bubblewrap.bst
@@ -49,15 +45,14 @@ depends:
 
 variables:
   optimize-debug: 'false'
-  webkitgtk_toolchain: ''
   webkitgtk_arch_options: ''
   (?):
   - arch == "i686" or arch == "arm":
-      webkitgtk_toolchain: -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain.%{arch}
+      webkitgtk_arch_options: -DCMAKE_BUILD_TYPE=Release
   cmake-local: >-
     -DPORT=GTK
-    %{webkitgtk_toolchain}
     %{webkitgtk_arch_options}
+
 (?):
 - arch == "i686":
     environment:
@@ -67,6 +62,7 @@ variables:
     environment:
       CFLAGS: '%{flags_arm} -g1'
       CXXFLAGS: '%{flags_arm} -g1'
+
 public:
   bst:
     split-rules:


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