1
0
forked from pool/libqt5-qtbase

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
This commit is contained in:
Dominique Leuenberger 2017-08-24 15:41:06 +00:00 committed by Git OBS Bridge
parent dbbac26a9c
commit 03f11fc468
2 changed files with 14 additions and 0 deletions

View File

@ -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 Thu Aug 3 08:56:09 UTC 2017 - mlin@suse.com

View File

@ -738,7 +738,9 @@ echo yes | ./configure $platform \
-no-reduce-relocations \ -no-reduce-relocations \
%endif %endif
%ifarch %ix86 %ifarch %ix86
%if 0%{?sle_version:%sle_version} < 150000
-no-sse2 -no-pch \ -no-sse2 -no-pch \
%endif
%endif %endif
-optimized-qmake \ -optimized-qmake \
-accessibility \ -accessibility \
@ -789,6 +791,7 @@ make %{?_smp_mflags}
make INSTALL_ROOT=%{buildroot} install make INSTALL_ROOT=%{buildroot} install
%ifarch %ix86 %ifarch %ix86
%if 0%{?sle_version:%sle_version} < 150000
install -d %{buildroot}%{libqt5_libdir}/sse2/ install -d %{buildroot}%{libqt5_libdir}/sse2/
pushd src/corelib; make clean ; ../../bin/qmake -config sse2; make %{?_smp_mflags} 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/ cp -av ../../lib/libQt5Gui.so.* %{buildroot}%{libqt5_libdir}/sse2/
popd popd
%endif %endif
%endif
install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.qt5 install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.qt5
# argggh, qmake is such a piece of <censored> # argggh, qmake is such a piece of <censored>
@ -911,9 +915,11 @@ popd
%doc *.txt LICENSE.* %doc *.txt LICENSE.*
%{libqt5_libdir}/libQt5Core.so.* %{libqt5_libdir}/libQt5Core.so.*
%ifarch %ix86 %ifarch %ix86
%if 0%{?sle_version:%sle_version} < 150000
%dir %{libqt5_libdir}/sse2 %dir %{libqt5_libdir}/sse2
%{libqt5_libdir}/sse2/libQt5Core.so.* %{libqt5_libdir}/sse2/libQt5Core.so.*
%endif %endif
%endif
%files -n libQt5Core-devel %files -n libQt5Core-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
@ -1058,8 +1064,10 @@ popd
%doc *.txt LICENSE.* %doc *.txt LICENSE.*
%{libqt5_libdir}/libQt5Gui.so.* %{libqt5_libdir}/libQt5Gui.so.*
%ifarch %ix86 %ifarch %ix86
%if 0%{?sle_version:%sle_version} < 150000
%{libqt5_libdir}/sse2/libQt5Gui.so.* %{libqt5_libdir}/sse2/libQt5Gui.so.*
%endif %endif
%endif
%{libqt5_libdir}/libQt5EglFSDeviceIntegration.so.* %{libqt5_libdir}/libQt5EglFSDeviceIntegration.so.*
%{libqt5_libdir}/libQt5EglFsKmsSupport.so.* %{libqt5_libdir}/libQt5EglFsKmsSupport.so.*
%{libqt5_libdir}/libQt5XcbQpa.so.* %{libqt5_libdir}/libQt5XcbQpa.so.*