cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix the relocation error seen with clang/lld 10 on i386 in this embedded

Browse Source 
copy of Qt4 WebKit as well; originally from jca@
This commit is contained in:
naddy 2020-08-13 18:40:38 +00:00
parent 7848952239
commit 67ba02fd5f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
textproc/wkhtmltopdf/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2019/07/12 20:50:16 sthen Exp $
# $OpenBSD: Makefile,v 1.24 2020/08/13 18:40:38 naddy Exp $
ONLY_FOR_ARCHS = amd64 i386
USE_WXNEEDED = Yes
@ -14,7 +14,7 @@ QT_COMMIT = 5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
MASTER_SITES0 = https://github.com/wkhtmltopdf/qt/archive/
DISTFILES = ${DISTNAME}.tar.gz \
wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
REVISION = 1
REVISION = 2
SHARED_LIBS = wkhtmltox 0.0 # 0.12

9
textproc/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs_cpp
View File

@ -1,12 +1,13 @@
$OpenBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs_cpp,v 1.1 2016/01/06 16:50:35 sthen Exp $
--- qt/src/3rdparty/webkit/Source/JavaScriptCore/jit/JITStubs.cpp.orig Wed Dec 9 21:34:01 2015
+++ qt/src/3rdparty/webkit/Source/JavaScriptCore/jit/JITStubs.cpp Wed Dec 9 21:34:22 2015
$OpenBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs_cpp,v 1.2 2020/08/13 18:40:38 naddy Exp $
Index: qt/src/3rdparty/webkit/Source/JavaScriptCore/jit/JITStubs.cpp
--- qt/src/3rdparty/webkit/Source/JavaScriptCore/jit/JITStubs.cpp.orig
+++ qt/src/3rdparty/webkit/Source/JavaScriptCore/jit/JITStubs.cpp
@@ -79,7 +79,7 @@ namespace JSC {
#define THUMB_FUNC_PARAM(name)
#endif
-#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
+#if (OS(LINUX) || OS(FREEBSD) || OS(OPENBSD)) && CPU(X86_64)
+#if (OS(LINUX) || OS(FREEBSD) || OS(OPENBSD)) && (CPU(X86) || CPU(X86_64))
#define SYMBOL_STRING_RELOCATION(name) #name "@plt"
#elif OS(DARWIN) || (CPU(X86_64) && COMPILER(MINGW) && !GCC_VERSION_AT_LEAST(4, 5, 0))
#define SYMBOL_STRING_RELOCATION(name) "_" #name