From 03f11fc46881cd4823998744e2b479f07c56e1581082ca7f392ca30ff19861f7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 24 Aug 2017 15:41:06 +0000 Subject: [PATCH] Accepting request 515720 from KDE:Qt5 - Don't special case sse2 libs on i586 for SLE-15, it supports only SSE2 capable CPUs. OBS-URL: https://build.opensuse.org/request/show/515720 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=63 --- libqt5-qtbase.changes | 6 ++++++ libqt5-qtbase.spec | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index 2b3ffad..22e6712 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 9 13:01:22 UTC 2017 - matz@suse.com + +- Don't special case sse2 libs on i586 for SLE-15, it supports + only SSE2 capable CPUs. + ------------------------------------------------------------------- Thu Aug 3 08:56:09 UTC 2017 - mlin@suse.com diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index 185a834..a574631 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -738,7 +738,9 @@ echo yes | ./configure $platform \ -no-reduce-relocations \ %endif %ifarch %ix86 +%if 0%{?sle_version:%sle_version} < 150000 -no-sse2 -no-pch \ +%endif %endif -optimized-qmake \ -accessibility \ @@ -789,6 +791,7 @@ make %{?_smp_mflags} make INSTALL_ROOT=%{buildroot} install %ifarch %ix86 +%if 0%{?sle_version:%sle_version} < 150000 install -d %{buildroot}%{libqt5_libdir}/sse2/ pushd src/corelib; make clean ; ../../bin/qmake -config sse2; make %{?_smp_mflags} @@ -799,6 +802,7 @@ pushd src/gui; ../../bin/qmake -config sse2; make %{?_smp_mflags} cp -av ../../lib/libQt5Gui.so.* %{buildroot}%{libqt5_libdir}/sse2/ popd %endif +%endif install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.qt5 # argggh, qmake is such a piece of @@ -911,9 +915,11 @@ popd %doc *.txt LICENSE.* %{libqt5_libdir}/libQt5Core.so.* %ifarch %ix86 +%if 0%{?sle_version:%sle_version} < 150000 %dir %{libqt5_libdir}/sse2 %{libqt5_libdir}/sse2/libQt5Core.so.* %endif +%endif %files -n libQt5Core-devel %defattr(-,root,root,755) @@ -1058,8 +1064,10 @@ popd %doc *.txt LICENSE.* %{libqt5_libdir}/libQt5Gui.so.* %ifarch %ix86 +%if 0%{?sle_version:%sle_version} < 150000 %{libqt5_libdir}/sse2/libQt5Gui.so.* %endif +%endif %{libqt5_libdir}/libQt5EglFSDeviceIntegration.so.* %{libqt5_libdir}/libQt5EglFsKmsSupport.so.* %{libqt5_libdir}/libQt5XcbQpa.so.*