rpms/qt5-qtdeclarative
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(branch backport): drop shadow/out-of-tree builds (#1456211,QTBUG-37417)

Browse Source
This commit is contained in:
Rex Dieter 2017-06-16 10:07:59 -05:00
parent b5d9e92abf
commit 17274dcf21
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qt5-qtdeclarative.spec
View File

@ -23,7 +23,7 @@
Summary: Qt5 - QtDeclarative component Summary: Qt5 - QtDeclarative component
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.6.2 Version: 5.6.2
Release: 2%{?dist} Release: 3%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -130,13 +130,6 @@ rm -rfv src/3rdparty/double-conversion
%build %build
mkdir %{_target_platform}
pushd %{_target_platform}
%{qmake_qt5} ..
popd
make %{?_smp_mflags} -C %{_target_platform}
%if 0%{?nosse2_hack} %if 0%{?nosse2_hack}
# build libQt5Qml with no_sse2 # build libQt5Qml with no_sse2
mkdir -p %{_target_platform}-no_sse2 mkdir -p %{_target_platform}-no_sse2
@ -147,13 +140,17 @@ make %{?_smp_mflags} -C src/qml
popd popd
%endif %endif
%{qmake_qt5}
make %{?_smp_mflags}
%if 0%{?docs} %if 0%{?docs}
make %{?_smp_mflags} docs -C %{_target_platform} make %{?_smp_mflags} docs
%endif %endif
%install %install
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} make install INSTALL_ROOT=%{buildroot}
%if 0%{?nosse2_hack} %if 0%{?nosse2_hack}
mkdir -p %{buildroot}%{_qt5_libdir}/sse2 mkdir -p %{buildroot}%{_qt5_libdir}/sse2
@ -162,7 +159,7 @@ make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-no_sse2/src/qml
%endif %endif
%if 0%{?docs} %if 0%{?docs}
make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} make install_docs INSTALL_ROOT=%{buildroot}
%endif %endif
# hardlink files to %{_bindir}, add -qt5 postfix to not conflict # hardlink files to %{_bindir}, add -qt5 postfix to not conflict
@ -214,11 +211,11 @@ test -z "$(grep double-conversion %{buildroot}%{_qt5_libdir}/*.{la,prl})"
export CTEST_OUTPUT_ON_FAILURE=1 export CTEST_OUTPUT_ON_FAILURE=1
export PATH=%{buildroot}%{_qt5_bindir}:$PATH export PATH=%{buildroot}%{_qt5_bindir}:$PATH
export LD_LIBRARY_PATH=%{buildroot}%{_qt5_libdir} export LD_LIBRARY_PATH=%{buildroot}%{_qt5_libdir}
make sub-tests-all %{?_smp_mflags} -C %{_target_platform} make sub-tests-all %{?_smp_mflags}
xvfb-run -a \ xvfb-run -a \
dbus-launch --exit-with-session \ dbus-launch --exit-with-session \
time \ time \
make check -k -C %{_target_platform}/tests ||: make check -k -C tests ||:
%endif %endif
@ -272,6 +269,9 @@ make check -k -C %{_target_platform}/tests ||:
%changelog %changelog
* Mon Jun 19 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.6.2-3
- (branch backport): drop shadow/out-of-tree builds (#1456211,QTBUG-37417)
* Tue Apr 11 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.6.2-2 * Tue Apr 11 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.6.2-2
- pull in upstream crash fix (QTBUG-46263) - pull in upstream crash fix (QTBUG-46263)