* Do NOT hide the build commands.

* Don't use -ffunction-sections.  It provides no appreciable gain but
  causes a text relocation on i386 in JITStubs.cpp.  x11/qt4 also
  doesn't use it.
This commit is contained in:
naddy 2018-11-21 22:18:51 +00:00
parent c4688f85dd
commit a2fe581a1d
2 changed files with 21 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:11 sthen Exp $
# $OpenBSD: Makefile,v 1.22 2018/11/21 22:18:51 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 = 0
REVISION = 1
SHARED_LIBS = wkhtmltox 0.0 # 0.12
@ -100,7 +100,6 @@ do-configure:
-nomake tools \
-nomake tests \
-nomake translations \
-silent \
-xrender \
-largefile \
-iconv \

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-qt_src_3rdparty_webkit_Source_WebCore_WebCore_pri,v 1.1 2018/11/21 22:18:51 naddy Exp $
The -f*-sections options provide no gain and cause a text relocation
in JITStubs.o on i386.
Index: qt/src/3rdparty/webkit/Source/WebCore/WebCore.pri
--- qt/src/3rdparty/webkit/Source/WebCore/WebCore.pri.orig
+++ qt/src/3rdparty/webkit/Source/WebCore/WebCore.pri
@@ -322,8 +322,8 @@ mac {
LIBS_PRIVATE += -framework Carbon -framework AppKit
}
-unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
-unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
+#unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+#unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork