[Git][debian-gis-team/gdal][master] Don't run python generate target in parallel.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / gdal


Commits:
160cbb63 by Bas Couwenberg at 2018-08-20T18:54:33Z
Don't run python generate target in parallel.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gdal (2.3.1+dfsg-3) UNRELEASED; urgency=medium
 
   * Bump Standards-Version to 4.2.0, no changes.
+  * Don't run python generate target in parallel.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 04 Aug 2018 11:59:03 +0200
 


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -155,12 +155,11 @@ override_dh_auto_build:
 	$(MAKE) $(NJOBS) -C $(CURDIR)/swig/java clean generate build
 
 	# It needs pre-installing just after the building due to intermediate cleaning.
-	# Apply conditionally an on-fly patch for pre 1.3.38 swig versions.
 	for V in $(PYVERS); do \
-		cp GDALmake.opt-$$V GDALmake.opt; \
-		$(MAKE) $(NJOBS) -C $(CURDIR)/swig/python clean; \
-		$(MAKE) $(NJOBS) -C $(CURDIR)/swig/python generate build; \
-		$(MAKE) $(NJOBS) -C $(CURDIR)/swig/python install DESTDIR=$(CURDIR)/debian/python-tmp; \
+		cp GDALmake.opt-$$V GDALmake.opt && \
+		$(MAKE) $(NJOBS) -C $(CURDIR)/swig/python clean && \
+		$(MAKE) -C $(CURDIR)/swig/python generate && \
+		$(MAKE) $(NJOBS) -C $(CURDIR)/swig/python build install DESTDIR=$(CURDIR)/debian/python-tmp; \
 	done
 
 	mkdir $(CURDIR)/html || true



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/commit/160cbb63ba58d24b2e37cc3aa61fe85fabc2ef4b

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/commit/160cbb63ba58d24b2e37cc3aa61fe85fabc2ef4b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180820/94b10f4f/attachment-0001.html>