qt5-qtwebkit: Enable i686 build

This commit is contained in:
Tee KOBAYASHI 2022-11-11 02:33:06 +09:00 committed by xtkoba
parent 887f57f1ea
commit d1810dc340
2 changed files with 21 additions and 6 deletions

View File

@ -0,0 +1,18 @@
--- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp
+++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
@@ -652,6 +652,15 @@
static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
#elif CPU(X86) && COMPILER(GCC_OR_CLANG) && OS(LINUX) && defined(__PIC__)
+#ifdef __ANDROID__
+asm(
+ ".text\n"
+ "__x86.get_pc_thunk.bx:\n"
+ " movl (%esp), %ebx\n"
+ " ret\n"
+ ".previous\n"
+);
+#endif
#define defineUnaryDoubleOpWrapper(function) \
asm( \
".text\n" \

View File

@ -3,14 +3,11 @@ TERMUX_PKG_DESCRIPTION="Qt 5 WebKit Library"
TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_MAINTAINER="Simeon Huang <symeon@librehat.com>"
TERMUX_PKG_VERSION="5.212.0-alpha4"
TERMUX_PKG_REVISION=10
TERMUX_PKG_REVISION=11
TERMUX_PKG_SRCURL="https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-${TERMUX_PKG_VERSION}/qtwebkit-${TERMUX_PKG_VERSION}.tar.xz"
TERMUX_PKG_SHA256=9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6
TERMUX_PKG_DEPENDS="libc++, qt5-qtbase, qt5-qtdeclarative, qt5-qtlocation, qt5-qtmultimedia, qt5-qtsensors, zlib, libxslt, libxcomposite, libhyphen, libwebp, libicu"
TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools"
TERMUX_PKG_DEPENDS="libc++, libhyphen, libicu, libjpeg-turbo, libpng, libsqlite, libwebp, libx11, libxml2, libxslt, qt5-qtbase, qt5-qtdeclarative, qt5-qtlocation, qt5-qtmultimedia, qt5-qtsensors, zlib"
TERMUX_PKG_BUILD_DEPENDS="libxcomposite, qt5-qtbase-cross-tools"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DPORT=Qt -DUSE_LD_GOLD=OFF -DUSE_GSTREAMER=OFF -DUSE_QT_MULTIMEDIA=ON -DENABLE_OPENGL=OFF -DENABLE_SAMPLING_PROFILER=OFF -DENABLE_WEBKIT2=OFF"
# undefined reference to __x86.get_pc_thunk.bx
TERMUX_PKG_BLACKLISTED_ARCHES="i686"
# TODO SAMPLING_PROFILER requires glibc. We might be able to patch the source to make it work with bionic