[gnome-build-meta] sdk/WebKitGTK+: don't disable gtk-doc and gobject-introspection when cross compiling
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta] sdk/WebKitGTK+: don't disable gtk-doc and gobject-introspection when cross compiling
- Date: Thu, 4 Oct 2018 10:41:08 +0000 (UTC)
commit f546b47897494e7b7345147a2883f0b233cc08f2
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Tue Oct 2 11:47:25 2018 +0100
sdk/WebKitGTK+: don't disable gtk-doc and gobject-introspection when cross compiling
Fix #76
elements/sdk/WebKitGTK+.bst | 2 ++
.../gtk-doc-introspection-cross-compiling.patch | 16 ++++++++++++++++
2 files changed, 18 insertions(+)
---
diff --git a/elements/sdk/WebKitGTK+.bst b/elements/sdk/WebKitGTK+.bst
index 763a1a3..85a511e 100644
--- a/elements/sdk/WebKitGTK+.bst
+++ b/elements/sdk/WebKitGTK+.bst
@@ -2,6 +2,8 @@ kind: cmake
sources:
- kind: tar
url: webkitgtk_org:webkitgtk-2.22.2.tar.xz
+- kind: patch
+ path: files/webkitgtk/gtk-doc-introspection-cross-compiling.patch
- kind: local
path: files/webkitgtk/toolchain.i386
- kind: local
diff --git a/files/webkitgtk/gtk-doc-introspection-cross-compiling.patch
b/files/webkitgtk/gtk-doc-introspection-cross-compiling.patch
new file mode 100644
index 0000000..01383d2
--- /dev/null
+++ b/files/webkitgtk/gtk-doc-introspection-cross-compiling.patch
@@ -0,0 +1,16 @@
+diff -ru WebKit.orig/Source/cmake/OptionsGTK.cmake WebKit/Source/cmake/OptionsGTK.cmake
+--- WebKit.orig/Source/cmake/OptionsGTK.cmake 2018-10-02 11:40:57.986556392 +0100
++++ WebKit/Source/cmake/OptionsGTK.cmake 2018-10-02 11:42:45.217474632 +0100
+@@ -356,12 +356,6 @@
+ set(ENABLE_INTROSPECTION OFF)
+ endif ()
+
+-# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building.
+-if (CMAKE_CROSSCOMPILING)
+- set(ENABLE_GTKDOC OFF)
+- set(ENABLE_INTROSPECTION OFF)
+-endif ()
+-
+ # Override the cached variable, gtk-doc does not really work when building on Mac.
+ if (APPLE)
+ set(ENABLE_GTKDOC OFF)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]