Mercurial > mxe-octave
changeset 5879:0d1af1b88257
maint: merge release to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 07 Sep 2021 14:48:19 -0400 |
parents | 61d6b59e6490 (current diff) 0e80767f2199 (diff) |
children | 7bc0af5b2c9a |
files | |
diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/build-gettext.mk Tue Sep 07 14:31:33 2021 -0400 +++ b/src/build-gettext.mk Tue Sep 07 14:48:19 2021 -0400 @@ -17,6 +17,8 @@ tail -1 endef +## Use -j 1 instead of -j $(JOBS) to avoid failures with parallel builds. + define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ @@ -24,7 +26,7 @@ --without-libexpat-prefix \ --without-libxml2-prefix \ $($(PKG)_CONFIGURE_OPTIONS) - $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 if test x$(MXE_SYSTEM) = xmsvc; then \ cd '$(1).build' && $(CONFIGURE_POST_HOOK); \ fi
--- a/src/gettext.mk Tue Sep 07 14:31:33 2021 -0400 +++ b/src/gettext.mk Tue Sep 07 14:48:19 2021 -0400 @@ -18,8 +18,6 @@ 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) \ @@ -29,7 +27,7 @@ --without-libexpat-prefix \ --without-libxml2-prefix \ CONFIG_SHELL=$(SHELL) && $(CONFIGURE_POST_HOOK) - $(MAKE) -C '$(1)/gettext-runtime/intl' -j 1 + $(MAKE) -C '$(1)/gettext-runtime/intl' -j '$(JOBS)' $(MAKE) -C '$(1)/gettext-runtime/intl' -j 1 $(MXE_DISABLE_DOCS) install DESTDIR='$(3)' cd '$(1)/gettext-tools' && ./configure \ @@ -41,7 +39,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 1 + $(MAKE) -C '$(1)/gettext-tools/intl' -j '$(JOBS)' $(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); \