Source: orc
Version: 1:0.4.28-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
orc fails to cross build from source, because it does not pass a
--cross-file to meson. Doing so is not exactly trivial, though mesons'
addition of debcrossgen helps a lot. By far the easiest way of doing it
is using debhelper. The attached patch implements that and makes orc
cross build successfully. Please consider applying it. The patch also
makes the build system honour DEB_BUILD_OPTIONS=nocheck. Furthermore, I
suggest to add --parallel to dh to speed up the build (now possible via
using dh_auto_build).
Helmut
diff --minimal -Nru orc-0.4.28/debian/changelog orc-0.4.28/debian/changelog
--- orc-0.4.28/debian/changelog 2018-05-31 16:03:45.000000000 +0200
+++ orc-0.4.28/debian/changelog 2018-08-10 06:54:08.000000000 +0200
@@ -1,3 +1,10 @@
+orc (1:0.4.28-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Use debhelpers meson buildsystem. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 10 Aug 2018 06:54:08 +0200
+
orc (1:0.4.28-2) unstable; urgency=medium
* debian/control:
diff --minimal -Nru orc-0.4.28/debian/rules orc-0.4.28/debian/rules
--- orc-0.4.28/debian/rules 2017-11-20 17:40:44.000000000 +0100
+++ orc-0.4.28/debian/rules 2018-08-10 06:54:08.000000000 +0200
@@ -2,35 +2,32 @@
include /usr/share/dpkg/default.mk
-export MAKE = ninja -v
-
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
%:
- dh $@
+ dh $@ --buildsystem=meson
override_dh_auto_configure:
if test -r /proc/cpuinfo; then \
cat /proc/cpuinfo; \
fi
- mkdir -p deb-build && meson --buildtype plain --prefix /usr
--default-library shared . deb-build
- mkdir -p deb-build-static && meson --buildtype plain --prefix /usr
--default-library static -Db_staticpic=true -Ddisable_gtkdoc=true
-Ddisable_tests=true . deb-build-static
+ dh_auto_configure --builddirectory=deb-build -- --default-library shared
+ dh_auto_configure --builddirectory=deb-build-static --
--default-library=static -Db_staticpic=true -Ddisable_gtkdoc=true
-Ddisable_tests=true
override_dh_auto_build:
- $(MAKE) -C deb-build all
- $(MAKE) -C deb-build-static all
+ dh_auto_build --builddirectory=deb-build
+ dh_auto_build --builddirectory=deb-build-static
override_dh_auto_clean:
rm -rf deb-build deb-build-static
dh_auto_clean
override_dh_auto_install:
- DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C deb-build install
- DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C deb-build-static install
- dh_auto_install
+ dh_auto_install --builddirectory=deb-build
+ dh_auto_install --builddirectory=deb-build-static
override_dh_auto_test:
- $(MAKE) -C deb-build test || true
+ dh_auto_test --builddirectory=test || true
override_dh_strip:
dh_strip -pliborc-0.4-0 --dbg-package=liborc-0.4-0-dbg
