Mercurial > mxe-octave

changeset 5885:fbad4bcfdf3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* build-gettext.mk: One more attempt to fix build issues.
author John W. Eaton <jwe@octave.org>
date Fri, 10 Sep 2021 15:34:26 -0400
parents 62eada485ce7
children d1f4f3739a52
files src/build-gettext.mk
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/build-gettext.mk	Fri Sep 10 13:23:24 2021 -0400
+++ b/src/build-gettext.mk	Fri Sep 10 15:34:26 2021 -0400
@@ -17,6 +17,12 @@
     tail -1
 endef
 
+## See
+##
+## https://octave.discourse.group/t/octave-space-fails-to-build-gnutls/1573/19
+##
+## for a discussion about the CCACHE_NODIRECT setting below.
+
 define $(PKG)_BUILD
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
@@ -24,9 +30,6 @@
         --without-libexpat-prefix \
         --without-libxml2-prefix \
 	$($(PKG)_CONFIGURE_OPTIONS)
-    $(MAKE) -C '$(1).build/gnulib-local' -j $(JOBS)
-    $(MAKE) -C '$(1).build/gettext-runtime/gnulib-lib' -j $(JOBS)
-    $(MAKE) -C '$(1).build/gettext-tools/gnulib-lib' -j $(JOBS)
-    $(MAKE) -C '$(1).build' -j $(JOBS)
+    CCACHE_NODIRECT=1 $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 $(MXE_DISABLE_DOCS) install DESTDIR='$(3)'
 endef