[arch-commits] Commit in qt5-script/trunk (PKGBUILD qt5-script-lto.patch)

[Antonio Rojas]

    Date: Wednesday, January 5, 2022 @ 22:00:58
  Author: arojas
Revision: 433468

Disable LTO (FS#73264)

Modified:
  qt5-script/trunk/PKGBUILD
Deleted:
  qt5-script/trunk/qt5-script-lto.patch

----------------------+
 PKGBUILD             |   13 ++++++-------
 qt5-script-lto.patch |   11 -----------
 2 files changed, 6 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-05 21:12:24 UTC (rev 433467)
+++ PKGBUILD	2022-01-05 22:00:58 UTC (rev 433468)
@@ -4,7 +4,7 @@
 pkgname=qt5-script
 _qtver=5.15.8
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -13,20 +13,19 @@
 makedepends=('git')
 groups=('qt' 'qt5')
 _pkgfqn=${pkgname/5-/}
-source=(git+https://code.qt.io/qt/$_pkgfqn.git#tag=v${pkgver}-lts
-        qt5-script-lto.patch)
-sha256sums=('SKIP'
-            '48da16d6fff324db3aed7b0ad455894250ffbf29613cd60c8879027567d9abb5')
+source=(git+https://code.qt.io/qt/$_pkgfqn.git#tag=v${pkgver}-lts)
+sha256sums=('SKIP')
+options=(!lto)
 
 prepare() {
   mkdir -p build
-  patch -d $_pkgfqn -p1 < qt5-script-lto.patch # Fix build with LTO
 }
 
 build() {
   cd build
 
-  qmake ../${_pkgfqn}
+# Disable LTO, see FS#73264
+  qmake ../${_pkgfqn} CONFIG-=ltcg
   make
 }
 

Deleted: qt5-script-lto.patch
===================================================================
--- qt5-script-lto.patch	2022-01-05 21:12:24 UTC (rev 433467)
+++ qt5-script-lto.patch	2022-01-05 22:00:58 UTC (rev 433468)
@@ -1,11 +0,0 @@
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.h.orig    2016-02-03 13:46:12.000000000 +0100
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.h 2016-04-24 14:24:42.396004500 +0200
-@@ -316,7 +316,7 @@
-     EncodedJSValue JIT_STUB cti_op_to_primitive(STUB_ARGS_DECLARATION);
-     EncodedJSValue JIT_STUB cti_op_typeof(STUB_ARGS_DECLARATION);
-     EncodedJSValue JIT_STUB cti_op_urshift(STUB_ARGS_DECLARATION);
--    EncodedJSValue JIT_STUB cti_vm_throw(STUB_ARGS_DECLARATION);
-+    EncodedJSValue JIT_STUB cti_vm_throw(STUB_ARGS_DECLARATION) __attribute__((used));
-     EncodedJSValue JIT_STUB cti_to_object(STUB_ARGS_DECLARATION);
-     JSObject* JIT_STUB cti_op_construct_JSConstruct(STUB_ARGS_DECLARATION);
-     JSObject* JIT_STUB cti_op_new_array(STUB_ARGS_DECLARATION);