Blame intl/icu-patches/bug-1198952-workaround-make-3.82-bug.diff

Packit f0b94e
diff --git a/intl/icu/source/Makefile.in b/intl/icu/source/Makefile.in
Packit f0b94e
--- a/intl/icu/source/Makefile.in
Packit f0b94e
+++ b/intl/icu/source/Makefile.in
Packit f0b94e
@@ -134,32 +134,36 @@ endif
Packit f0b94e
 
Packit f0b94e
 LOCAL_SUBDIRS = $(SUBDIRS)
Packit f0b94e
 CLEAN_FIRST_SUBDIRS = $(TOOLS)
Packit f0b94e
 
Packit f0b94e
 $(LIBDIR) $(BINDIR):
Packit f0b94e
 	-$(MKINSTALLDIRS) $@
Packit f0b94e
 
Packit f0b94e
 ## Recursive targets
Packit f0b94e
+## Strictly speaking, the $(MAKEOVERRIDES) is not necessary when recursing, but
Packit f0b94e
+## there is a bug in GNU make 3.82 that throws away the original overrides in
Packit f0b94e
+## favor of RECURSIVE=YES when the submake in the subdirectory restarts itself
Packit f0b94e
+## after dependency files have been created.
Packit f0b94e
 all-recursive install-recursive clean-recursive distclean-recursive dist-recursive check-recursive check-exhaustive-recursive: $(LIBDIR) $(BINDIR)
Packit f0b94e
 ifneq ($(NEED_ESCAPING),)
Packit f0b94e
 	@echo "building tools/escapesrc (Needed for this platform with NEED_ESCAPING)"
Packit f0b94e
-	@(cd tools/escapesrc && $(MAKE) RECURSIVE=YES $$local_target) || exit
Packit f0b94e
+	@(cd tools/escapesrc && $(MAKE) $(MAKEOVERRIDES) RECURSIVE=YES $$local_target) || exit
Packit f0b94e
 endif
Packit f0b94e
 	@dot_seen=no; \
Packit f0b94e
 	target=`echo $@ | sed s/-recursive//`; \
Packit f0b94e
 	list='$(LOCAL_SUBDIRS)'; for subdir in $$list; do \
Packit f0b94e
 	  echo "$(MAKE)[$(MAKELEVEL)]: Making \`$$target' in \`$$subdir'"; \
Packit f0b94e
 	  if test "$$subdir" = "."; then \
Packit f0b94e
 	    dot_seen=yes; \
Packit f0b94e
 	    local_target="$$target-local"; \
Packit f0b94e
 	  else \
Packit f0b94e
 	    local_target="$$target"; \
Packit f0b94e
 	  fi; \
Packit f0b94e
-	  (cd $$subdir && $(MAKE) RECURSIVE=YES $$local_target) || exit; \
Packit f0b94e
+	  (cd $$subdir && $(MAKE) $(MAKEOVERRIDES) RECURSIVE=YES $$local_target) || exit; \
Packit f0b94e
 	done; \
Packit f0b94e
 	if test "$$dot_seen" = "no"; then \
Packit f0b94e
 	  $(MAKE) "$$target-local" || exit; \
Packit f0b94e
 	fi
Packit f0b94e
 
Packit f0b94e
 clean-recursive-with-twist:
Packit f0b94e
 	$(MAKE) clean-recursive LOCAL_SUBDIRS='$(CLEAN_FIRST_SUBDIRS) $(filter-out $(CLEAN_FIRST_SUBDIRS),$(LOCAL_SUBDIRS))'
Packit f0b94e