[boinc] 01/01: Another experimental upload, with parallel building enabled

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit 4ca63a0c8ae5bc202cb87b9cac6fe573c39fe093
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Aug 5 13:28:05 2014 +0200

    Another experimental upload, with parallel building enabled
---
 debian/changelog                    |  8 ++++++++
 debian/patches/parallel-build.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        |  4 ----
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ecdcc1c..a5e8dd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+boinc (7.4.8+dfsg-3exp3) experimental; urgency=medium
+
+  * d/p/parallel-build.patch d/r
+    enabled parallel build for all builds, now the package
+    should build properly.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 05 Aug 2014 13:22:53 +0200
+
 boinc (7.4.8+dfsg-3exp2) experimental; urgency=medium
 
   * Build with --parallel for experimental builds
diff --git a/debian/patches/parallel-build.patch b/debian/patches/parallel-build.patch
new file mode 100644
index 0000000..20fd5cb
--- /dev/null
+++ b/debian/patches/parallel-build.patch
@@ -0,0 +1,32 @@
+Description: this should ensure that parallel builds work on debian (since the dependencies are changed with dynamic libraries)
+--- boinc-7.4.8+dfsg.orig/Makefile.incl
++++ boinc-7.4.8+dfsg/Makefile.incl
+@@ -42,22 +42,22 @@ AM_LDFLAGS =
+ # programs linking to them:
+ 
+ LIBSCHED = -lsched
+-$(LIBSCHED):
++$(LIBSCHED_STATIC):
+ 	cd $(top_builddir)/sched; ${MAKE} libsched.la
+ LIBSCHED_FCGI = -lsched_fcgi
+-$(LIBSCHED_FCGI):
++$(LIBSCHED_FCGI_STATIC):
+ 	cd $(top_builddir)/sched; ${MAKE} libsched_fcgi.la
+ LIBBOINC = -lboinc
+-$(LIBBOINC):
++$(LIBBOINC_STATIC):
+ 	cd $(top_builddir)/lib; ${MAKE} libboinc.la
+ LIBBOINC_CRYPT = -lboinc_crypt
+-$(LIBBOINC_CRYPT):
++$(LIBBOINC_CRYPT_STATIC):
+ 	cd $(top_builddir)/lib; ${MAKE} libboinc.la
+ LIBBOINC_FCGI = -lboinc_fcgi
+-$(LIBBOINC_FCGI):
++$(LIBBOINC_FCGI_STATIC):
+ 	cd $(top_builddir)/lib; ${MAKE} libboinc_fcgi.la
+ LIBAPI = -lboinc_api
+-$(LIBAPI):
++$(LIBAPI_STATIC):
+ 	cd $(top_builddir)/api; ${MAKE} libboinc_api.la
+ 
+ SERVERLIBS = $(LIBSCHED) $(LIBBOINC_CRYPT) $(LIBBOINC) $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index 7d12dad..c21c87b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,3 +37,4 @@ disable_silent_rules.patch
 server_status_php.patch
 #db_interface_use.patch
 boinc-server-dynamic-libs.patch
+parallel-build.patch
diff --git a/debian/rules b/debian/rules
index 9ae9a3a..ca8c3c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -196,11 +196,7 @@ CFGFLAGS_boinc-client = \
 # Default rule
 
 %:
-ifeq (,$(ENABLE_SERVER_TEST))
 	dh $@ --with python2 --parallel
-else
-	dh $@ --with python2
-endif
 #	if [ ! -f debian/control -o debian/control.in -nt debian/control ]; then \
 		echo "Generating debian/control file from debian/control.in" ; \
 		( \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git