Bug#1104428: brltty: FTBFS with GNUMAKEFLAGS=--shuffle=reverse

[Lucas Nussbaum]

Source: brltty
Version: 6.7-1
Severity: minor
Tags: patch

Hi,

GNU Make now has a --shuffle option that simulates non-deterministic 
ordering of dependencies. See 
https://trofi.github.io/posts/238-new-make-shuffle-mode.html and also 
previous work in Debian by Santiago Vila: 
https://people.debian.org/~sanvila/make-shuffle/

brltty fails to build with GNUMAKEFLAGS=--shuffle=reverse.

This patch fixes it. There are two issues: one in debian/rules, and one
in the upstream Makefile.in.

diff -Nru brltty-6.7/debian/patches/fix-makefile-dep.patch brltty-6.7/debian/patches/fix-makefile-dep.patch
--- brltty-6.7/debian/patches/fix-makefile-dep.patch	1970-01-01 00:00:00.000000000 +0000
+++ brltty-6.7/debian/patches/fix-makefile-dep.patch	2024-10-17 18:32:36.000000000 +0000
@@ -0,0 +1,11 @@
+--- brltty-6.7.orig/Programs/Makefile.in
++++ brltty-6.7/Programs/Makefile.in
+@@ -1183,7 +1183,7 @@ install-tools: all-tools install-program
+ XBRLAPI_X11_AUTOSTART_FILE = 90xbrlapi
+ XBRLAPI_GDM_AUTOSTART_FILE = xbrlapi.desktop
+ 
+-install-xbrlapi: xbrlapi$X install-program-directory install-x11-autostart-directory install-gdm-autostart-directory
++install-xbrlapi: xbrlapi$X install-program-directory install-x11-autostart-directory install-gdm-autostart-directory install-man1-directory
+ 	$(INSTALL_PROGRAM) xbrlapi$X $(INSTALL_PROGRAM_DIRECTORY) 
+ 	$(INSTALL_DATA) $(BLD_TOP)$(DOC_DIR)/xbrlapi.1 $(INSTALL_MAN1_DIRECTORY)
+ 	$(INSTALL_DATA) $(BLD_TOP)Autostart/X11/$(XBRLAPI_X11_AUTOSTART_FILE) $(INSTALL_X11_AUTOSTART_DIRECTORY)
diff -Nru brltty-6.7/debian/patches/series brltty-6.7/debian/patches/series
--- brltty-6.7/debian/patches/series	2024-10-17 18:32:36.000000000 +0000
+++ brltty-6.7/debian/patches/series	2024-10-17 18:32:36.000000000 +0000
@@ -2,3 +2,4 @@
 40-no-update-pot.patch
 41-java-bytecode-compat.patch
 disable-synth-callback.patch
+fix-makefile-dep.patch
diff -Nru brltty-6.7/debian/rules brltty-6.7/debian/rules
--- brltty-6.7/debian/rules	2024-10-17 18:32:36.000000000 +0000
+++ brltty-6.7/debian/rules	2024-10-17 18:32:36.000000000 +0000
@@ -84,7 +84,7 @@
 		$(DEB_CONFIGURE_OPTIONS)
 
 config-python: $(PYVERS:%=build-py%/config.status)
-build-py%/config.status:
+build-py%/config.status: configure acdir/config.sub acdir/config.guess
 	mkdir -p build-py$*
 	cd build-py$* && \
 	PYTHON=/usr/bin/python$* \