Skip to content

Commit

Permalink
Merge branch 'mer-5.6' into 'mer-5.6'
Browse files Browse the repository at this point in the history
[Qt] Aarch64 build fixes. Contributes JB#36790

Add -no-pch to configure for aarch64 builds
EGL X seems to be built if it can be, which seems to be under aarch64.

See merge request !12
  • Loading branch information
xfade committed Nov 19, 2016
2 parents 9abaefe + e5581a7 commit 55e3f26
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions rpm/qtbase.spec
Expand Up @@ -507,6 +507,9 @@ MAKEFLAGS=%{?_smp_mflags} \
-no-xkbcommon \
-no-xcb \
-no-xinput2 \
%ifarch aarch64
-no-pch \
%endif
-qreal float \
-journald
fi # config.status check
Expand Down Expand Up @@ -892,6 +895,9 @@ ln -s %{_sysconfdir}/xdg/qtchooser/5.conf %{buildroot}%{_sysconfdir}/xdg/qtchoos
%{_libdir}/libQt5EglDeviceIntegration.so*
%{_libdir}/libQt5EglDeviceIntegration.prl
%{_libdir}/qt5/plugins/platforms/libqeglfs.so
%if %{with X11}
%{_libdir}/qt5/plugins/egldeviceintegrations/libqeglfs-x11-integration.so
%endif
%{_datadir}/qt5/mkspecs/modules/qt_lib_eglfs_device_lib_private.pri

%files plugin-platform-minimalegl
Expand Down

0 comments on commit 55e3f26

Please sign in to comment.