From 1e4d634744fbd394dd810b4ebb50f3f494edf306a65e240c6602c01f028899df Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 14 Mar 2021 08:04:25 +0000 Subject: [PATCH] Accepting request 878544 from home:favogt:qtdi586 - Work around implicit dependency of src/qml on qmltyperegistrar which lead to an incomplete libQt5Qml5.so build for non-SSE2 OBS-URL: https://build.opensuse.org/request/show/878544 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdeclarative?expand=0&rev=15 --- libqt5-qtdeclarative.changes | 6 ++++++ libqt5-qtdeclarative.spec | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index ea16c55..2060929 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 12 12:06:44 UTC 2021 - Fabian Vogt + +- Work around implicit dependency of src/qml on qmltyperegistrar + which lead to an incomplete libQt5Qml5.so build for non-SSE2 + ------------------------------------------------------------------- Sun Dec 27 12:18:28 UTC 2020 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index fb91a36..6989490 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -159,7 +159,13 @@ make %{?_smp_mflags} VERBOSE=1 -C %{_target_platform} mkdir -p %{_target_platform}-no_sse2 pushd %{_target_platform}-no_sse2 %qmake5 -config no_sse2 .. -- -no-qml-jit -make %{?_smp_mflags} sub-src-clean + +make %{?_smp_mflags} VERBOSE=1 sub-src-qmake_all +# src/qml/Makefile has to be generated after qmltyperegistrar was built, +# so we have to run qmake again after that. There is no explicit +# dependency, it relies on CONFIG+=ordered... +make %{?_smp_mflags} VERBOSE=1 -C src/qmltyperegistrar +make %{?_smp_mflags} VERBOSE=1 sub-src-qmake_all make %{?_smp_mflags} VERBOSE=1 -C src/qml popd %endif