[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.5.0+dfsg-4-47-gc387b32
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Tue Sep 8 13:43:21 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=e62f041
The following commit has been merged in the kubuntu_unstable branch:
commit e62f0410f66b4dcdaaea051ba02db6caa5ea9537
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Fri May 22 11:11:51 2015 +0000
Import Ubuntu debian/rules changes
---
debian/rules | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 69 insertions(+), 9 deletions(-)
diff --git a/debian/rules b/debian/rules
index 2ed9843..2870bae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,6 +66,9 @@ ifeq ($(DEB_HOST_ARCH_CPU),i386)
cpu_opt = -no-sse2 -no-pch
endif
+# Skip tests on the archs they are known to be flaky with current configuration
+testskip_architectures := arm64 powerpc ppc64el
+
ifeq ($(DEB_HOST_ARCH_OS),linux)
ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64 mips64 mips64el arm64))
platform_arg = linux-g++
@@ -91,9 +94,46 @@ endif
%:
dh $@ --parallel --with pkgkde_symbolshelper
+x86_architectures := i386 amd64
+
override_dh_auto_configure:
- MAKEFLAGS="-j$(NUMJOBS)" ./configure \
- -confirm-license \
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(x86_architectures)))
+ MAKEFLAGS="-j$(NUMJOBS)" ./configure -v -confirm-license \
+ -prefix "/usr" \
+ -bindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" \
+ -libdir "/usr/lib/arm-linux-gnueabihf" \
+ -docdir "/usr/share/qt5/doc" \
+ -headerdir "/usr/include/arm-linux-gnueabihf/qt5" \
+ -datadir "/usr/share/qt5" \
+ -archdatadir "/usr/lib/arm-linux-gnueabihf/qt5" \
+ -hostdatadir "/usr/share/qt5" \
+ -plugindir "/usr/lib/arm-linux-gnueabihf/qt5/plugins" \
+ -importdir "/usr/lib/arm-linux-gnueabihf/qt5/imports" \
+ -translationdir "/usr/share/qt5/translations" \
+ -hostdatadir "/usr/lib/arm-linux-gnueabihf/qt5" \
+ -sysconfdir "/etc/xdg" \
+ -examplesdir "/usr/lib/arm-linux-gnueabihf/qt5/examples" \
+ -opensource \
+ --no-dbus \
+ --no-libjpeg \
+ --no-glib \
+ -platform linux-g++ \
+ -qt-zlib \
+ -no-rpath \
+ -verbose \
+ -optimized-qmake \
+ -no-strip \
+ -no-separate-debug-info \
+ -qpa xcb \
+ -xcb \
+ -no-icu \
+ -accessibility \
+ -no-directfb \
+ -no-sql-ibase -no-pch -no-opengl \
+ -xplatform ubuntu-arm-gnueabihf-g++ || file $(CURDIR)/bin/qmake;
+ mv $(CURDIR)/bin/qmake $(CURDIR)/bin/qt5-qmake-arm-linux-gnueabihf
+endif
+ MAKEFLAGS="-j$(NUMJOBS)" ./configure -confirm-license \
-prefix "/usr" \
-bindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" \
-libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \
@@ -126,7 +166,6 @@ override_dh_auto_configure:
-verbose \
-optimized-qmake \
-dbus-linked \
- -reduce-relocations \
-no-strip \
-no-separate-debug-info \
-qpa xcb \
@@ -139,6 +178,13 @@ override_dh_auto_configure:
$(extra_configure_opts) \
$(cpu_opt)
+override_dh_auto_test:
+ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ xvfb-run -a -s "-screen 0 640x480x24" make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib PATH=$(CURDIR)/bin:$(PATH)
+endif
+endif
+
override_dh_auto_clean:
[ ! -f Makefile ] || $(MAKE) confclean distclean
@@ -165,6 +211,7 @@ override_dh_auto_clean:
;
# Leftover dirs
+ # Ubuntu diff: tests enablement related
find -depth -type d \( -false \
-o -name debug-shared \
-o -name debug-static \
@@ -176,10 +223,11 @@ override_dh_auto_clean:
-o -name .rcc \
-o -name release-shared \
-o -name release-static \
- -o -name .uic \
- \) -print0 | xargs -0 rm -rf
+ -o -name .uic \) -print \
+ | xargs rm -rf
# Leftover files and all symlinks
+ # Ubuntu diff: tests enablement related
find \( -false \
-o -name \*.a \
-o -name Makefile.Debug \
@@ -188,8 +236,11 @@ override_dh_auto_clean:
-o -name \*.prl \
-o -name \*.so \
-o -name \*.so.debug \
- -o -type l \
- \) -print0 | xargs -0 rm -rf
+ -o -type l \) -print \
+ | grep -v tests/auto/corelib/plugin/qpluginloader/elftest \
+ | grep -v tests/auto/corelib/io/qdir/types \
+ | grep -v tests/auto/corelib/plugin/qlibrary/library_path/invalid.so \
+ | xargs rm -rf
# Delete all Makefiles, excluding some from src/3rdparty
find $(CURDIR) -name Makefile \
@@ -200,9 +251,10 @@ override_dh_auto_clean:
-print0 | xargs -0 rm -rf
# Any remaining executables
+ # Ubuntu diff: tests enablement related
find $(CURDIR) -type f -perm /u+x,g+x,o+x -exec file -i '{}' \; \
| grep -e application/x-executable \
- | cut -d ':' -f 1 | xargs rm -f
+ | cut -d ':' -f 1 | grep -v tests/auto | xargs rm -f
# Generated on build
rm -vf debian/stamp-makefile-build-tools
@@ -253,6 +305,12 @@ endif
ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/qt5.conf
ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/default.conf
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(x86_architectures)))
+ # ship the qt5-qmake-arm-linux-gnueabihf in /usr/bin
+ mkdir -p $(CURDIR)/debian/tmp/usr/bin
+ cp $(CURDIR)/bin/qt5-qmake-arm-linux-gnueabihf $(CURDIR)/debian/tmp/usr/bin
+endif
+
# Remove leftover directories
find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5 -depth -type d \( -false \
-o -name .moc\* \
@@ -317,7 +375,9 @@ override_dh_strip:
dh_strip --remaining-packages --dbg-package=qtbase5-dbg
override_dh_makeshlibs:
- dh_makeshlibs -V
+ # Don't uncomment until rid of -gles packages
+ #dh_makeshlibs -V
+ dh_makeshlibs
# Check for private symbols not marked as such. Be verbose.
pkgkde-mark-private-symbols debian/qtbase5-private-dev/usr/include
--
qtbase packaging
More information about the pkg-kde-commits
mailing list