fix libprelude FTBFS #944580

1 files changed, 62 insertions, 0 deletions

diff --git a/bootstrap.sh b/bootstrap.sh
index 8269f31..d06cb9b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1517,6 +1517,68 @@ add_automatic libpng1.6
 patch_libprelude() {
 	echo "removing the unsatisfiable g++ build dependency"
 	drop_privs sed -i -e '/^\s\+g++/d' debian/control
+	echo "fix FTBFS with gawk #944580"
+	drop_privs patch -p1 <<'EOF'
+--- a/src/libprelude-error/Makefile.am	
++++ b/src/libprelude-error/Makefile.am
+@@ -53,7 +53,7 @@
+
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ 	LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+-	-v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
++	-v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
+ 	$(srcdir)/errnos.in >$@
+
+ prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
+--- a/src/libprelude-error/Makefile.in
++++ b/src/libprelude-error/Makefile.in
+@@ -1834,7 +1834,7 @@
+
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ 	LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+-	-v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
++	-v prefix=PRELUDE_ERROR_ -v pkg_namespace=errnos_ \
+ 	$(srcdir)/errnos.in >$@
+
+ prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
+--- a/src/libprelude-error/mkstrtable.awk
++++ b/src/libprelude-error/mkstrtable.awk
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+
+ BEGIN {
+@@ -102,7 +102,7 @@
+       print "/* The purpose of this complex string table is to produce";
+       print "   optimal code with a minimum of relocations.  */";
+       print "";
+-      print "static const char " namespace "msgstr[] = ";
++      print "static const char " pkg_namespace "msgstr[] = ";
+       header = 0;
+     }
+   else
+@@ -150,14 +150,14 @@
+   else
+     print "  gettext_noop (\"" prefix last_msgstr "\");";
+   print "";
+-  print "static const int " namespace "msgidx[] =";
++  print "static const int " pkg_namespace "msgidx[] =";
+   print "  {";
+   for (i = 0; i < coded_msgs; i++)
+     print "    " pos[i] ",";
+   print "    " pos[coded_msgs];
+   print "  };";
+   print "";
+-  print "#define " namespace "msgidxof(code) (0 ? -1 \\";
++  print "#define " pkg_namespace "msgidxof(code) (0 ? -1 \\";
+
+ # Gather the ranges.
+   skip = code[0];
+EOF
 }
 buildenv_libprelude() {
 	case $(dpkg-architecture "-a$HOST_ARCH" -qDEB_HOST_GNU_SYSTEM) in *gnu*)