widelands-dev team mailing list archive

["Jens Beyer \(Qcumber-some\)" <Qcumber-some@xxxxxxxxxxxxx>]

Jens Beyer (Qcumber-some) has proposed merging lp:~qcumber-some/widelands/bug1287241 into lp:~widelands-dev/widelands/debian.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1287241 in widelands: "Parallel compilation on launchpad builder is broken"
  https://bugs.launchpad.net/widelands/+bug/1287241

For more details, see:
https://code.launchpad.net/~qcumber-some/widelands/bug1287241/+merge/209091

I don't know how the original rules file was created.

But in my eyes there are two changes necessary - the first line does not work at all, and the second line seems to be an error.
-- 
https://code.launchpad.net/~qcumber-some/widelands/bug1287241/+merge/209091
Your team Widelands Developers is requested to review the proposed merge of lp:~qcumber-some/widelands/bug1287241 into lp:~widelands-dev/widelands/debian.

=== modified file 'debian/rules'
--- debian/rules	2014-02-25 18:12:33 +0000
+++ debian/rules	2014-03-03 16:16:07 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # parallel building
-parallel=$(shell echo $$DEB_BUILD_OPTIONS | grep parallel > /dev/null && echo -j$$(test -f /proc/cpuinfo && cat /proc/cpuinfo | (grep ^processor || echo 1) | wc -l))
+parallel=$(shell echo "-j `cat /proc/cpuinfo | grep -c 'processor'`")
 
 # Hardening flags
 CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
@@ -24,7 +24,7 @@
 		../ && cat src/config.h
 
 override_dh_auto_build:
-	cd build-debian && make VERBOSE=1 ${parallel}
+	cd build-debian && make VERBOSE=1 $(parallel)
 
 override_dh_auto_install:
 	cd build-debian && make install DESTDIR=`pwd`/../debian/tmp