[Git][debian-gis-team/routino][master] 3 commits: Add patch to not use subshells for make in subdirectories. (closes: #1121851)

[Bas Couwenberg (@sebastic)]

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


Commits:
8f3d543d by Bas Couwenberg at 2025-12-03T19:00:14+01:00
Add patch to not use subshells for make in subdirectories. (closes: #1121851)

- - - - -
3fd7c0df by Bas Couwenberg at 2025-12-03T19:05:55+01:00
Don't use test-build-validate-cleanup, fails where pbuilder --twice succeeds.

- - - - -
f55fbf52 by Bas Couwenberg at 2025-12-03T19:06:23+01:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/.gitlab-ci.yml
- debian/changelog
- debian/patches/series
- + debian/patches/subdir-errors.patch


Changes:

=====================================
debian/.gitlab-ci.yml
=====================================
@@ -2,9 +2,6 @@
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
 
-variables:
-  SALSA_CI_ENABLE_VALIDATE_PACKAGE_CLEAN_UP: 1
-
 piuparts:
   allow_failure: true
 debrebuild:


=====================================
debian/changelog
=====================================
@@ -1,10 +1,12 @@
-routino (3.4.3-3) UNRELEASED; urgency=medium
+routino (3.4.3-3) unstable; urgency=medium
 
   * Use debrebuild instead of reprotest.
   * Add patch by Helmut Grohne to fix cross building.
     (closes: #1121852)
+  * Add patch to not use subshells for make in subdirectories.
+    (closes: #1121851)
 
- -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Nov 2025 12:12:08 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 03 Dec 2025 19:05:59 +0100
 
 routino (3.4.3-2) unstable; urgency=medium
 


=====================================
debian/patches/series
=====================================
@@ -8,3 +8,4 @@ hardening
 #use_openlayers
 clean.patch
 cross.patch
+subdir-errors.patch


=====================================
debian/patches/subdir-errors.patch
=====================================
@@ -0,0 +1,138 @@
+Description: Don't use subshell for make in subdirs which don't propagate errors.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/1121851
+Forwarded: mailto:amb at routino.org
+
+--- a/Makefile
++++ b/Makefile
+@@ -30,35 +30,35 @@ SUBDIRS=src xml doc web extras python
+ 
+ all:
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ ########
+ 
+ test:
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ ########
+ 
+ install:
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ ########
+ 
+ clean:
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ ########
+ 
+ distclean:
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ ########
+--- a/extras/Makefile
++++ b/extras/Makefile
+@@ -31,35 +31,35 @@ SUBDIRS=$(foreach f,$(SUBFILES),$(dir $f
+ 
+ all:
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ ########
+ 
+ test:
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ ########
+ 
+ install:
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ ########
+ 
+ clean:
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ ########
+ 
+ distclean:
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ ########
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -61,7 +61,7 @@ endif
+ 
+ all: all-local
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ all-local: all-exe all-lib
+@@ -268,7 +268,7 @@ routino-slim.lib : routino-slim.dll rout
+ 
+ test: test-local
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ test-local:
+@@ -277,7 +277,7 @@ test-local:
+ 
+ install: install-local
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ install-local: all-local
+@@ -307,7 +307,7 @@ install-local: all-local
+ 
+ clean: clean-local
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ clean-local:
+@@ -324,7 +324,7 @@ clean-local:
+ 
+ distclean: distclean-local
+ 	for dir in $(SUBDIRS); do \
+-	   ( cd $$dir && $(MAKE) $@ ); \
++	   $(MAKE) -C $$dir $@ ; \
+ 	done
+ 
+ distclean-local: clean-local



View it on GitLab: https://salsa.debian.org/debian-gis-team/routino/-/compare/2176d367cf6323d611fa93286ff605fb5e9efe03...f55fbf521da654bfb66ae02bddd7b7166030a69d

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/routino/-/compare/2176d367cf6323d611fa93286ff605fb5e9efe03...f55fbf521da654bfb66ae02bddd7b7166030a69d
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/20251203/5166c253/attachment-0001.htm>