mirror of
https://git.yoctoproject.org/poky
synced 2026-05-07 16:59:22 +00:00
webkitgtk: update 2.34.6 -> 2.36.0
Drop patches: 0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch 0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch (both merged upstream) reduce-memory-overheads.patch (rejected by upstream, there's no use case - see the discussion) Rebase to version submitted upstream: 0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch Add: 0001-When-building-introspection-files-do-not-quote-CFLAG.patch angle is no longer needed for x11-less setups. (From OE-Core rev: 05582e9e6583126879977b0bbb88b691d625056b) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
30b38d9cb9
commit
54fddf8d0a
+23
-15
@@ -1,4 +1,4 @@
|
||||
From 317a5ac120c44987219bc03486cd2f2d1842c9b9 Mon Sep 17 00:00:00 2001
|
||||
From e0bf97eecfa601e08b9578f00b1000890284241a Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 27 Oct 2015 16:02:19 +0200
|
||||
Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
|
||||
@@ -6,22 +6,30 @@ Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
|
||||
|
||||
Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232933]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
Source/cmake/FindGObjectIntrospection.cmake | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
Source/cmake/FindGObjectIntrospection.cmake | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake
|
||||
index e1f49b4..03a4446 100644
|
||||
index be96814a..ae67b593 100644
|
||||
--- a/Source/cmake/FindGObjectIntrospection.cmake
|
||||
+++ b/Source/cmake/FindGObjectIntrospection.cmake
|
||||
@@ -26,6 +26,7 @@ macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname _extra_args)
|
||||
else ()
|
||||
string(REGEX REPLACE "[\r\n]" " " _result "${_result}")
|
||||
string(REGEX REPLACE " +$" "" _result "${_result}")
|
||||
+ string(CONCAT _result $ENV{PKG_CONFIG_SYSROOT_DIR} "${_result}")
|
||||
separate_arguments(_result)
|
||||
set(${_outvar} ${_result} CACHE INTERNAL "")
|
||||
endif ()
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
|
||||
|
||||
-
|
||||
find_package(PkgConfig QUIET)
|
||||
if (PKG_CONFIG_FOUND)
|
||||
if (PACKAGE_FIND_VERSION_COUNT GREATER 0)
|
||||
@@ -30,6 +29,9 @@ if (PKG_CONFIG_FOUND)
|
||||
pkg_get_variable(INTROSPECTION_GENERATE gobject-introspection-1.0 g_ir_generate)
|
||||
pkg_get_variable(INTROSPECTION_GIRDIR gobject-introspection-1.0 girdir)
|
||||
pkg_get_variable(INTROSPECTION_TYPELIBDIR gobject-introspection-1.0 typelibdir)
|
||||
+ set(INTROSPECTION_SCANNER "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_SCANNER}")
|
||||
+ set(INTROSPECTION_COMPILER "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_COMPILER}")
|
||||
+ set(INTROSPECTION_GENERATE "$ENV{PKG_CONFIG_SYSROOT_DIR}${INTROSPECTION_GENERATE}")
|
||||
set(INTROSPECTION_VERSION "${_pc_gir_VERSION}")
|
||||
if (${INTROSPECTION_VERSION} VERSION_GREATER_EQUAL "1.59.1")
|
||||
set(INTROSPECTION_HAVE_SOURCES_TOP_DIRS YES)
|
||||
|
||||
-46
@@ -1,46 +0,0 @@
|
||||
From 4718888071e29deb8b245b88c81577fd5bac4e5e Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Mon, 29 Aug 2016 16:38:11 +0300
|
||||
Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir
|
||||
|
||||
Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232935]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
Source/WebKit/PlatformGTK.cmake | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
|
||||
index a069c5f6..ea2f542b 100644
|
||||
--- a/Source/WebKit/PlatformGTK.cmake
|
||||
+++ b/Source/WebKit/PlatformGTK.cmake
|
||||
@@ -650,8 +650,9 @@ if (ENABLE_INTROSPECTION)
|
||||
set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}")
|
||||
endif ()
|
||||
|
||||
- add_custom_command(
|
||||
- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
|
||||
+ # This is a target and not a command because it's used to build another .gir
|
||||
+ # and a .typelib, which would trigger two racy parallel builds when using command
|
||||
+ add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
|
||||
DEPENDS WebKit
|
||||
DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
|
||||
COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
|
||||
@@ -699,7 +700,7 @@ if (ENABLE_INTROSPECTION)
|
||||
add_custom_command(
|
||||
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
|
||||
DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
|
||||
- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
|
||||
+ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
|
||||
COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
|
||||
LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
|
||||
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
|
||||
@@ -761,7 +762,7 @@ if (ENABLE_INTROSPECTION)
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
|
||||
- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
|
||||
+ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
|
||||
COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
|
||||
)
|
||||
|
||||
-52
@@ -1,52 +0,0 @@
|
||||
From 8f1e170a6de8036ab50eb35834a77f2c79412ee3 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Wed, 28 Oct 2015 14:18:57 +0200
|
||||
Subject: [PATCH] When building introspection files, add CMAKE_C_FLAGS to the
|
||||
compiler flags.
|
||||
|
||||
g-ir-compiler is using a C compiler internally, so it needs to set
|
||||
the proper flags for it.
|
||||
|
||||
Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232936]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
Source/JavaScriptCore/PlatformGTK.cmake | 2 +-
|
||||
Source/WebKit/PlatformGTK.cmake | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake
|
||||
index 0b2968d2..2742ad80 100644
|
||||
--- a/Source/JavaScriptCore/PlatformGTK.cmake
|
||||
+++ b/Source/JavaScriptCore/PlatformGTK.cmake
|
||||
@@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION)
|
||||
add_custom_command(
|
||||
OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
|
||||
DEPENDS JavaScriptCore
|
||||
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
|
||||
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
|
||||
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
|
||||
${INTROSPECTION_SCANNER}
|
||||
--quiet
|
||||
diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
|
||||
index e36e4c35..943f9794 100644
|
||||
--- a/Source/WebKit/PlatformGTK.cmake
|
||||
+++ b/Source/WebKit/PlatformGTK.cmake
|
||||
@@ -742,7 +742,7 @@ if (ENABLE_INTROSPECTION)
|
||||
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
|
||||
DEPENDS WebKit
|
||||
DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
|
||||
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
|
||||
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
|
||||
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
|
||||
${INTROSPECTION_SCANNER}
|
||||
--quiet
|
||||
@@ -786,7 +786,7 @@ if (ENABLE_INTROSPECTION)
|
||||
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
|
||||
DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
|
||||
DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
|
||||
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
|
||||
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
|
||||
LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
|
||||
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
|
||||
${INTROSPECTION_SCANNER}
|
||||
+78
@@ -0,0 +1,78 @@
|
||||
From 01f5ab0edf3dd8f76d37fd36c2dcd3108be33a7b Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Mon, 4 Apr 2022 21:20:05 +0200
|
||||
Subject: [PATCH] When building introspection files, do not quote CFLAGS.
|
||||
|
||||
This does not seem to be propagated to the compiler correctly:
|
||||
|
||||
In file included from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/syslimits.h:7,
|
||||
from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/limits.h:34,
|
||||
from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/lib/glib-2.0/include/glibconfig.h:11,
|
||||
from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/gtypes.h:32,
|
||||
from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/galloca.h:32,
|
||||
from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib.h:30,
|
||||
from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/build/Source/JavaScriptCore/tmp-introspectb51ks33n/JavaScriptCore-4.0.c:2:
|
||||
/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.2.0/include-fixed/limits.h:203:75: error: no include path in which to search for limits.h
|
||||
203 | #include_next <limits.h> /* recurse down to the real one */
|
||||
| ^
|
||||
In file included from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/galloca.h:32,
|
||||
from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib.h:30,
|
||||
from /srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/build/Source/JavaScriptCore/tmp-introspectb51ks33n/JavaScriptCore-4.0.c:2:
|
||||
/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/gtypes.h:35:10: fatal error: time.h: No such file or directory
|
||||
35 | #include <time.h>
|
||||
| ^~~~~~~~
|
||||
compilation terminated.
|
||||
Traceback (most recent call last):
|
||||
File "/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/python3.10/distutils/unixccompiler.py", line 117, in _compile
|
||||
self.spawn(compiler_so + cc_args + [src, '-o', obj] +
|
||||
File "/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/python3.10/distutils/ccompiler.py", line 910, in spawn
|
||||
spawn(cmd, dry_run=self.dry_run)
|
||||
File "/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/lib/python3.10/distutils/spawn.py", line 91, in spawn
|
||||
raise DistutilsExecError(
|
||||
distutils.errors.DistutilsExecError: command '/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc' failed with exit code 1
|
||||
|
||||
Upstream-Status: Inappropriate [upstream has rewritten the whole thing as of https://github.com/WebKit/WebKit/commit/b0ae032850bb6b2672051bab8032fc9f9ef5eb97]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
Source/JavaScriptCore/PlatformGTK.cmake | 2 +-
|
||||
Source/WebKit/PlatformGTK.cmake | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/PlatformGTK.cmake b/Source/JavaScriptCore/PlatformGTK.cmake
|
||||
index 1c3c8fb7..efd18807 100644
|
||||
--- a/Source/JavaScriptCore/PlatformGTK.cmake
|
||||
+++ b/Source/JavaScriptCore/PlatformGTK.cmake
|
||||
@@ -71,7 +71,7 @@ if (ENABLE_INTROSPECTION)
|
||||
add_custom_command(
|
||||
OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
|
||||
DEPENDS JavaScriptCore
|
||||
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS=
|
||||
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
|
||||
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
|
||||
${INTROSPECTION_SCANNER}
|
||||
--quiet
|
||||
diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
|
||||
index 48d1820d..ded05035 100644
|
||||
--- a/Source/WebKit/PlatformGTK.cmake
|
||||
+++ b/Source/WebKit/PlatformGTK.cmake
|
||||
@@ -675,7 +675,7 @@ if (ENABLE_INTROSPECTION)
|
||||
add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir
|
||||
DEPENDS WebKit
|
||||
DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
|
||||
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS=
|
||||
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
|
||||
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
|
||||
${INTROSPECTION_SCANNER}
|
||||
--quiet
|
||||
@@ -721,7 +721,7 @@ if (ENABLE_INTROSPECTION)
|
||||
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
|
||||
DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
|
||||
DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
|
||||
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}"
|
||||
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS}
|
||||
LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
|
||||
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
|
||||
${INTROSPECTION_SCANNER}
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
From ec6045fcf5a46123b54029a675d08d89a5e30f21 Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Garcia <berto@igalia.com>
|
||||
Date: Sun, 25 Apr 2021 18:45:13 +0000
|
||||
Subject: [PATCH] Reduce memory usage when not using the Gold linker
|
||||
|
||||
Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232938]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
---
|
||||
Source/cmake/OptionsCommon.cmake | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
|
||||
index dd4da682..71ad6106 100644
|
||||
--- a/Source/cmake/OptionsCommon.cmake
|
||||
+++ b/Source/cmake/OptionsCommon.cmake
|
||||
@@ -101,6 +101,11 @@ option(GCC_OFFLINEASM_SOURCE_MAP
|
||||
${GCC_OFFLINEASM_SOURCE_MAP_DEFAULT})
|
||||
|
||||
option(USE_APPLE_ICU "Use Apple's internal ICU" ${APPLE})
|
||||
+# Pass --reduce-memory-overheads to the bfd linker in order to save memory
|
||||
+if (NOT USE_LD_GOLD)
|
||||
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--reduce-memory-overheads")
|
||||
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--reduce-memory-overheads")
|
||||
+endif ()
|
||||
|
||||
# Enable the usage of OpenMP.
|
||||
# - At this moment, OpenMP is only used as an alternative implementation
|
||||
+4
-5
@@ -11,15 +11,13 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842
|
||||
|
||||
SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
|
||||
file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \
|
||||
file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \
|
||||
file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
|
||||
file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
|
||||
file://reduce-memory-overheads.patch \
|
||||
file://0001-Fix-build-without-opengl-or-es.patch \
|
||||
file://reproducibility.patch \
|
||||
file://0001-When-building-introspection-files-do-not-quote-CFLAG.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6"
|
||||
SRC_URI[sha256sum] = "b877cca1f105235f5dd57c7ac2b2c2be3c6b691ff444f93925c7254cf156c64d"
|
||||
|
||||
inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
|
||||
|
||||
@@ -47,7 +45,7 @@ DEPENDS = " \
|
||||
PACKAGECONFIG_SOUP ?= "soup2"
|
||||
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2 angle', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \
|
||||
enchant \
|
||||
libsecret \
|
||||
@@ -72,6 +70,7 @@ PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=R
|
||||
PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms"
|
||||
PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3"
|
||||
PACKAGECONFIG[soup3] = ",,libsoup,,,soup2"
|
||||
PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd"
|
||||
|
||||
# webkitgtk is full of /usr/bin/env python, particular for generating docs
|
||||
do_configure[postfuncs] += "setup_python_link"
|
||||
Reference in New Issue
Block a user