# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1631039493 14400
# Node ID 61d6b59e649063c07b24785e73d64093b66526fd
# Parent  43d8099f411c6137149c8fdecb5041cf11b915f6# Parent  337390a0c7e2796231cf587c91c7168caa22d26b
maint: merge release to default.

diff -r 43d8099f411c -r 61d6b59e6490 src/gettext.mk
--- a/src/gettext.mk	Fri Sep 03 07:17:29 2021 -0400
+++ b/src/gettext.mk	Tue Sep 07 14:31:33 2021 -0400
@@ -18,6 +18,8 @@
     head -1
 endef
 
+## Use -j 1 instead of -j $(JOBS) to avoid failures with parallel builds.
+
 define $(PKG)_BUILD
     cd '$(1)/gettext-runtime' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
@@ -27,7 +29,7 @@
         --without-libexpat-prefix \
         --without-libxml2-prefix \
         CONFIG_SHELL=$(SHELL) && $(CONFIGURE_POST_HOOK)
-    $(MAKE) -C '$(1)/gettext-runtime/intl' -j '$(JOBS)' 
+    $(MAKE) -C '$(1)/gettext-runtime/intl' -j 1
     $(MAKE) -C '$(1)/gettext-runtime/intl' -j 1 $(MXE_DISABLE_DOCS) install DESTDIR='$(3)'
 
     cd '$(1)/gettext-tools' && ./configure \
@@ -39,7 +41,7 @@
         --without-libxml2-prefix \
         $(if $(filter msvc,$(MXE_SYSTEM)),ac_cv_func_memset=yes) \
         CONFIG_SHELL=$(SHELL) && $(CONFIGURE_POST_HOOK)
-     $(MAKE) -C '$(1)/gettext-tools/intl' -j '$(JOBS)' 
+     $(MAKE) -C '$(1)/gettext-tools/intl' -j 1
      $(MAKE) -C '$(1)/gettext-tools/intl' -j 1 install DESTDIR='$(3)' $(MXE_DISABLE_DOCS) bin_PROGRAMS=
      if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \
        rm -rf $(3)$(HOST_PREFIX)/share/doc/$(PKG); \