apply/fix some more NetBSD_DISABLED* usage in binutils.

mrgtwentythree · mrgtwentythree · commit 0f94eaf49e64 · 2023-01-02T00:55:45.000Z
this should fix issues seen with r/o source trees. note that the generated makefiles have weird bugs where the configure script edits the Makefile's AM_V_CCLD usage to insert "+ " and that makes the "@echo ..." that is AM_V_CCLD not be interpreted by make, but by shell and causing this to appear: 'sh: @echo: not found'. this only causes build output to be weird, not the build to be wrong.
diff --git a/external/gpl3/binutils.old/dist/bfd/doc/Makefile.am b/external/gpl3/binutils.old/dist/bfd/doc/Makefile.am
@@ -343,6 +343,8 @@ bfd.h: $(BFD_H_DEP)
 	echo "#endif" >> $@
 
 bfdver.texi: $(srcdir)/Makefile.in
+	@echo "NOT REBUILDING $@"
+NetBSD_DISABLED_bfdver.texi:
 	@echo "creating $@"; \
 	echo "@set VERSION $(VERSION)" > bfdver.texi; \
 	if test -n "$(PKGVERSION)"; then \
diff --git a/external/gpl3/binutils.old/dist/bfd/doc/Makefile.in b/external/gpl3/binutils.old/dist/bfd/doc/Makefile.in
@@ -539,7 +539,7 @@ clean-libtool:
 
 bfd.info: bfd.texi $(bfd_TEXINFOS)
 	@echo "NOT REBUILDING $@"
-NetBSD_DISABLED_bfd.info: bfd.texinfo $(bfd_TEXINFOS)
+NetBSD_DISABLED_bfd.info:
 	$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
 	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
@@ -1155,6 +1155,8 @@ bfd.h: $(BFD_H_DEP)
 	echo "#endif" >> $@
 
 bfdver.texi: $(srcdir)/Makefile.in
+	@echo "NOT REBUILDING $@"
+NetBSD_DISABLED_bfdver.texi:
 	@echo "creating $@"; \
 	echo "@set VERSION $(VERSION)" > bfdver.texi; \
 	if test -n "$(PKGVERSION)"; then \
diff --git a/external/gpl3/binutils/dist/bfd/Makefile.in b/external/gpl3/binutils/dist/bfd/Makefile.in
@@ -1781,6 +1781,8 @@ doc/$(am__dirstamp):
 	@: > doc/$(am__dirstamp)
 
 doc/bfd.info: doc/bfd.texi $(doc_bfd_TEXINFOS)
+	@zecho "NOT REBUILDING $@"
+NetBSD_DISABLED_doc/bfd.info:
 	@test -f doc/$(am__dirstamp) || $(MAKE) $(AM_MAKEFLAGS) doc/$(am__dirstamp)
 	$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
@@ -2520,6 +2522,8 @@ doc/bfdt.stamp: $(srcdir)/bfd.c $(srcdir)/doc/doc.str $(MKDOC) doc/$(am__dirstam
 	$(AM_V_GEN)$(REGEN_TEXI)
 
 doc/bfdver.texi: $(srcdir)/Makefile.in
+	@echo "NOT REBUILDING $@"
+NetBSD_DISABLED_bfdver.texi:
 	$(AM_V_GEN)\
 	$(MKDIR_P) $(@D); \
 	echo "@set VERSION $(VERSION)" > $@; \
diff --git a/external/gpl3/binutils/dist/bfd/doc/local.mk b/external/gpl3/binutils/dist/bfd/doc/local.mk
@@ -125,9 +125,13 @@ REGEN_TEXI = \
 # We use bfdt.texi, rather than bfd.texi, to avoid conflicting with
 # bfd.texi on an 8.3 filesystem.
 %D%/bfdt.stamp: $(srcdir)/bfd.c $(srcdir)/%D%/doc.str $(MKDOC) %D%/$(am__dirstamp)
+	@echo "NOT REBUILDING $@"
+NetBSD_DISABLED_bfdt.stamp:
 	$(AM_V_GEN)$(REGEN_TEXI)
 
 %D%/bfdver.texi: $(srcdir)/Makefile.in
+	@echo "NOT REBUILDING $@"
+NetBSD_DISABLED_bfdver.texi:
 	$(AM_V_GEN)\
 	$(MKDIR_P) $(@D); \
 	echo "@set VERSION $(VERSION)" > $@; \
diff --git a/external/gpl3/binutils/dist/ld/Makefile.in b/external/gpl3/binutils/dist/ld/Makefile.in
@@ -1664,7 +1664,7 @@ distclean-libtool:
 
 ld.info: ld.texi $(ld_TEXINFOS)
 	@echo "NOT REBUILDING $@"
-NetBSD_DISABLED_ld.info: ld.texinfo $(ld_TEXINFOS)
+NetBSD_DISABLED_ld.info:
 	$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
 	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
