Source: dino-im
Version: 0.0.git20190916.f746ce7-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

dino-im has a strange build system. It actually uses cmake with ninja
but wraps it inside configure and make. Doing so prevents debhelper from
passing the relevant cross compilation flags to cmake and thus
configures for the build architecture. The attached patch makes it use
cmake and ninja directly. However it doesn't make dino-im cross
buildable yet due to #889925. Please consider applying this patch anyway
as an incremental improvement and close this bug when doing so.

Helmut
diff --minimal -Nru dino-im-0.0.git20190916.f746ce7/debian/changelog 
dino-im-0.0.git20190916.f746ce7/debian/changelog
--- dino-im-0.0.git20190916.f746ce7/debian/changelog    2019-09-17 
22:57:20.000000000 +0200
+++ dino-im-0.0.git20190916.f746ce7/debian/changelog    2019-09-30 
06:00:18.000000000 +0200
@@ -1,3 +1,10 @@
+dino-im (0.0.git20190916.f746ce7-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Imrpove cross building: Use cmake+ninja directly. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Mon, 30 Sep 2019 06:00:18 +0200
+
 dino-im (0.0.git20190916.f746ce7-1) unstable; urgency=medium
 
   * New upstream git snapshot
diff --minimal -Nru dino-im-0.0.git20190916.f746ce7/debian/rules 
dino-im-0.0.git20190916.f746ce7/debian/rules
--- dino-im-0.0.git20190916.f746ce7/debian/rules        2019-09-17 
22:56:37.000000000 +0200
+++ dino-im-0.0.git20190916.f746ce7/debian/rules        2019-09-30 
06:00:18.000000000 +0200
@@ -3,10 +3,9 @@
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
-       dh $@
+       dh $@ --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
-       SHARED_SIGNAL_PROTOCOL=1 ./configure --prefix=/usr 
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dino-im --bindir=/usr/bin 
--enable-plugin=notification-sound
+       SHARED_SIGNAL_PROTOCOL=1 dh_auto_configure -- 
-DENABLED_PLUGINS=notification-sound -DBIN_INSTALL_DIR=/usr/bin 
-DLIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/dino-im
 
-override_dh_auto_clean:
-       rm -rf build/ Makefile
+override_dh_auto_test:

Reply via email to