mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-08 16:13:50 +02:00
webkit2gtk: add options for clang+lto, add big endian 32bit jsc fix
also explicitly add libgcrypt-devel which is needed but since some recent change was not being pulled in (probably some dep changed)
This commit is contained in:
parent
32ce8fe2cf
commit
17eeda78f4
2 changed files with 38 additions and 3 deletions
13
srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch
Normal file
13
srcpkgs/webkit2gtk/patches/be32-jsc-fix.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
This should fix a recent regression in JSC CLoop on BE/32bit.
|
||||||
|
|
||||||
|
--- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
|
||||||
|
+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
|
||||||
|
@@ -425,7 +425,7 @@ end)
|
||||||
|
op(llint_get_host_call_return_value, macro ()
|
||||||
|
functionPrologue()
|
||||||
|
pushCalleeSaves()
|
||||||
|
- loadp Callee[cfr], t0
|
||||||
|
+ loadp Callee + PayloadOffset[cfr], t0
|
||||||
|
convertCalleeToVM(t0)
|
||||||
|
loadi VM::encodedHostCallReturnValue + TagOffset[t0], t1
|
||||||
|
loadi VM::encodedHostCallReturnValue + PayloadOffset[t0], t0
|
|
@ -2,7 +2,7 @@
|
||||||
# ping q66 before touching this
|
# ping q66 before touching this
|
||||||
pkgname=webkit2gtk
|
pkgname=webkit2gtk
|
||||||
version=2.32.1
|
version=2.32.1
|
||||||
revision=1
|
revision=2
|
||||||
wrksrc="webkitgtk-${version}"
|
wrksrc="webkitgtk-${version}"
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
build_helper="gir"
|
build_helper="gir"
|
||||||
|
@ -29,7 +29,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
|
||||||
libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
|
libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
|
||||||
woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
|
woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
|
||||||
qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
|
qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
|
||||||
$(vopt_if x11 libXt-devel)
|
libgcrypt-devel $(vopt_if x11 libXt-devel)
|
||||||
$(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
|
$(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
|
||||||
short_desc="GTK+3 port of the WebKit2 browser engine"
|
short_desc="GTK+3 port of the WebKit2 browser engine"
|
||||||
maintainer="q66 <daniel@octaforge.org>"
|
maintainer="q66 <daniel@octaforge.org>"
|
||||||
|
@ -39,13 +39,16 @@ distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
|
||||||
checksum=136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917
|
checksum=136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917
|
||||||
make_check=no
|
make_check=no
|
||||||
|
|
||||||
build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser"
|
build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser
|
||||||
|
clang lto"
|
||||||
build_options_default="gir wayland x11 bubblewrap minibrowser"
|
build_options_default="gir wayland x11 bubblewrap minibrowser"
|
||||||
|
|
||||||
desc_option_bubblewrap="Enable bubblewrap sandbox"
|
desc_option_bubblewrap="Enable bubblewrap sandbox"
|
||||||
desc_option_jit="JavaScript JIT (Only some architectures)"
|
desc_option_jit="JavaScript JIT (Only some architectures)"
|
||||||
desc_option_sampling_profiler="Sampling profiler support (JIT + glibc only)"
|
desc_option_sampling_profiler="Sampling profiler support (JIT + glibc only)"
|
||||||
desc_option_minibrowser="Build the minibrowser"
|
desc_option_minibrowser="Build the minibrowser"
|
||||||
|
desc_option_clang="Use Clang to build"
|
||||||
|
desc_option_lto="Enable ThinLTO (needs Clang)"
|
||||||
|
|
||||||
export CFLAGS="-DNDEBUG"
|
export CFLAGS="-DNDEBUG"
|
||||||
export CXXFLAGS="$CFLAGS"
|
export CXXFLAGS="$CFLAGS"
|
||||||
|
@ -72,6 +75,20 @@ if [ "$build_option_bubblewrap" ]; then
|
||||||
depends+=" bubblewrap xdg-dbus-proxy"
|
depends+=" bubblewrap xdg-dbus-proxy"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$build_option_lto" -a -z "$build_option_clang" ]; then
|
||||||
|
broken="LTO needs Clang"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$build_option_clang" ]; then
|
||||||
|
hostmakedepends+=" clang lld"
|
||||||
|
configure_args+=" -DUSE_LD_LLD=ON"
|
||||||
|
nocross=yes
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$build_option_lto" ]; then
|
||||||
|
configure_args+=" -DLTO_MODE=thin"
|
||||||
|
fi
|
||||||
|
|
||||||
# only a few platform support JIT
|
# only a few platform support JIT
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
aarch64*|x86_64*)
|
aarch64*|x86_64*)
|
||||||
|
@ -102,6 +119,11 @@ if [ "$build_option_sampling_profiler" -a -z "$build_option_jit" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
|
if [ "$build_option_clang" ]; then
|
||||||
|
export CC=clang
|
||||||
|
export CXX=clang++
|
||||||
|
fi
|
||||||
|
|
||||||
# the debug builds are huge and cause problems when debugging
|
# the debug builds are huge and cause problems when debugging
|
||||||
export CFLAGS="${CFLAGS/-g/-g1}"
|
export CFLAGS="${CFLAGS/-g/-g1}"
|
||||||
export CXXFLAGS="${CXXFLAGS/-g/-g1}"
|
export CXXFLAGS="${CXXFLAGS/-g/-g1}"
|
||||||
|
|
Loading…
Add table
Reference in a new issue