Mercurial > louis > dpkg-lightsd

changeset 6:940798f7d8f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix parallel builds. new pkgrel And the rundir issue was a broken dev build.
author Louis Opter <kalessin@kalessin.fr>
date Sat, 14 Nov 2015 07:33:57 +0000
parents 8981778ea1e5
children 60c3d81a6ff2
files debian/changelog debian/rules
diffstat 2 files changed, 18 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/debian/changelog	Fri Nov 13 22:20:16 2015 -0800
+++ b/debian/changelog	Sat Nov 14 07:33:57 2015 +0000
@@ -1,3 +1,9 @@
+lightsd (1.1.0-2) unstable; urgency=low
+
+  * Fix parallel builds
+
+ -- Louis Opter <kalessin@kalessin.fr>  Sat, 14 Nov 2015 06:35:43 +0000
+
 lightsd (1.1.0-1) unstable; urgency=low
 
   * First published release
--- a/debian/rules	Fri Nov 13 22:20:16 2015 -0800
+++ b/debian/rules	Sat Nov 14 07:33:57 2015 +0000
@@ -16,10 +16,15 @@
 # package maintainers to append LDFLAGS
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    MAKEFLAGS += -j$(NUMJOBS)
+endif
+
 ifeq (,$(wildcard /run))
-    RUNTIME_DIRECTORY=/var/run/lightsd
+    RUNTIME_DIRECTORY=/var/run
 else
-    RUNTIME_DIRECTORY=/run/lightsd
+    RUNTIME_DIRECTORY=/run
 endif
 
 # main packaging script based on dh7 syntax
@@ -29,13 +34,15 @@
 # debmake generated override targets
 # This is example for Cmake (See http://bugs.debian.org/641051 )
 override_dh_auto_configure:
-	dh_auto_configure --parallel --				\
+	dh_auto_configure --					\
 	    	-DCMAKE_BUILD_TYPE=RELEASE			\
 		-DCMAKE_INSTALL_PREFIX=/usr			\
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)	\
 		-DLGTD_RUNTIME_DIRECTORY=$(RUNTIME_DIRECTORY)/lightsd
 
+override_dh_auto_build:
+	dh_auto_build --parallel
+
 override_dh_auto_install:
-	dh_auto_install --parallel
-	ls debian
+	dh_auto_install
 	rm -f debian/lightsd/usr/share/doc/lightsd/COPYING