diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2017-08-27 17:08:39 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2017-08-27 17:08:39 +0300 |
| commit | c7ca1fe383fbb314ff2c23fb043a61a58f865068 (patch) | |
| tree | a53bb458460cbfd58445a100256b8e5275ba8028 | |
| parent | fc5f48f4106650f6568d36730c1a688d571d3ff1 (diff) | |
| download | qt5webkit-c7ca1fe383fbb314ff2c23fb043a61a58f865068.tar.gz | |
Use ninja backend of CMake, fix docs build/install rules.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | debian/rules | 15 |
3 files changed, 12 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index ed32441..64fe2b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ qtwebkit-opensource-src (5.212.0~alpha2-1) UNRELEASED; urgency=medium * Drop unused build-dependency: libleveldb-dev. * Migrate to automatic dbgsym packages. * Update install files for the new release. - * Update debian/rules to use CMake build system. + * Update debian/rules to use CMake build system with ninja backend. * Update to debhelper compat level 10. * Rewrite debian/copyright. The new file is based on decopy output, with lots of manual fixes. diff --git a/debian/control b/debian/control index 854a70e..00b5b80 100644 --- a/debian/control +++ b/debian/control @@ -30,6 +30,7 @@ Build-Depends: bison, libxrender-dev, libxslt1-dev, mesa-common-dev, + ninja-build, pkg-config, pkg-kde-tools (>= 0.6.4), python-minimal, diff --git a/debian/rules b/debian/rules index 9a8d519..59ca27f 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,7 @@ #export DH_VERBOSE=1 DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) gstab_architectures := amd64 i386 powerpc s390x @@ -25,21 +26,25 @@ endif dh $@ --buildsystem=cmake --with pkgkde_symbolshelper override_dh_auto_configure: - dh_auto_configure -- -DPORT=Qt $(EXTRA_CMAKE_ARGUMENTS) + dh_auto_configure -- -G Ninja -DPORT=Qt $(EXTRA_CMAKE_ARGUMENTS) + +override_dh_auto_build-arch: + dh_auto_build --builddirectory=obj-$(DEB_HOST_GNU_TYPE) -O--buildsystem=ninja override_dh_auto_build-indep: - dh_auto_build -- sub-Source-QtWebKit-pro-clean - dh_auto_build -- -CSource -fMakefile.api docs + BUILDDIR=$(CURDIR)/obj-$(DEB_HOST_GNU_TYPE) \ + dh_auto_build --builddirectory=obj-$(DEB_HOST_GNU_TYPE) -O--buildsystem=ninja -- docs override_dh_auto_install-arch: - dh_auto_install + dh_auto_install --builddirectory=obj-$(DEB_HOST_GNU_TYPE) -O--buildsystem=ninja # Remove private headers rm -rf debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtWebKit/*/QtWebKit rm -rf debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtWebKitWidgets/*/QtWebKitWidgets override_dh_auto_install-indep: - dh_auto_build -- -CSource -fMakefile.api INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs + install -d debian/tmp/usr/share/qt5/ + cp -r obj-$(DEB_HOST_GNU_TYPE)/doc debian/tmp/usr/share/qt5/ override_dh_missing: dh_missing --fail-missing |