diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -22,7 +22,7 @@ riscv64_none_elf s390x sparc64 riscv32_unknown_elf FLAVOR?= native -USES= bison:alias compiler:env cpe gmake libtool makeinfo perl5 tar:xz +USES= bison:alias compiler:env cpe gmake libtool perl5 tar:xz USE_PERL5= build CPE_VENDOR= gnu GNU_CONFIGURE= yes @@ -38,7 +38,8 @@ CONFLICTS= libbfd -OPTIONS_DEFINE= NLS RELRO STATIC +OPTIONS_DEFINE= INFO NLS RELRO STATIC +OPTIONS_DEFAULT= INFO OPTIONS_SUB= yes STATIC_PREVENTS= NLS @@ -48,6 +49,8 @@ STATIC_LDFLAGS+= -all-static NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls +INFO_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-no-info +INFO_USES= makeinfo aarch64_COMMENT= GNU binutils for ${FLAVOR} development @@ -96,7 +99,7 @@ --with-mpfr=${LOCALBASE} \ --enable-targets=all \ --enable-threads=yes -INFO= as \ +INFO_INFO= as \ binutils \ gprof \ bfd \ diff --git a/devel/binutils/files/extra-patch-no-info b/devel/binutils/files/extra-patch-no-info --- a/devel/binutils/files/extra-patch-no-info +++ b/devel/binutils/files/extra-patch-no-info @@ -0,0 +1,100 @@ +--- bfd/Makefile.in.orig 2021-07-18 19:36:53.000000000 +0300 ++++ bfd/Makefile.in 2022-10-16 18:27:16.918172000 +0300 +@@ -461,7 +461,7 @@ + ACLOCAL_AMFLAGS = -I . -I .. -I ../config + INCDIR = $(srcdir)/../include + CSEARCH = -I. -I$(srcdir) -I$(INCDIR) +-SUBDIRS = doc po ++SUBDIRS = po + bfddocdir = doc + libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ + @SHARED_LDFLAGS@ $(am__empty) +--- binutils/doc/Makefile.in.orig 2021-07-18 19:38:08.000000000 +0300 ++++ binutils/doc/Makefile.in 2022-10-16 19:21:41.356639000 +0300 +@@ -695,7 +695,7 @@ + dist-info + check-am: all-am + check: check-am +-all-am: Makefile $(INFO_DEPS) $(MANS) ++all-am: Makefile $(MANS) + installdirs: + for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +@@ -751,7 +751,7 @@ + + info-am: $(INFO_DEPS) info-local + +-install-data-am: install-info-am install-man ++install-data-am: install-man + + install-dvi: install-dvi-am + +--- gas/doc/Makefile.in.orig 2021-07-18 19:37:38.000000000 +0300 ++++ gas/doc/Makefile.in 2022-10-16 19:04:22.556816000 +0300 +@@ -722,7 +722,7 @@ + dist-info + check-am: all-am + check: check-am +-all-am: Makefile $(INFO_DEPS) $(MANS) ++all-am: Makefile $(MANS) + installdirs: + for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +@@ -778,7 +778,7 @@ + + info-am: $(INFO_DEPS) info-local + +-install-data-am: install-data-local install-info-am install-man ++install-data-am: install-data-local install-man + + install-dvi: install-dvi-am + +@@ -948,7 +948,7 @@ + + # We want install to imply install-info as per GNU standards, despite the + # cygnus option. +-install-data-local: install-info ++install-data-local: + + # Maintenance + +--- gprof/Makefile.in.orig 2021-07-18 19:44:34.000000000 +0300 ++++ gprof/Makefile.in 2022-10-16 18:26:01.598791000 +0300 +@@ -935,7 +935,7 @@ + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive +-all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(MANS) $(HEADERS) gconfig.h ++all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) gconfig.h + installdirs: installdirs-recursive + installdirs-am: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ +@@ -998,7 +998,7 @@ + + info-am: $(INFO_DEPS) + +-install-data-am: install-info-am install-man ++install-data-am: install-man + + install-dvi: install-dvi-recursive + +--- ld/Makefile.in.orig 2021-07-18 19:38:34.000000000 +0300 ++++ ld/Makefile.in 2022-10-16 18:31:53.484540000 +0300 +@@ -1945,7 +1945,7 @@ + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive +-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(MANS) \ ++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) \ + config.h + installdirs: installdirs-recursive + installdirs-am: +@@ -2020,7 +2020,7 @@ + info-am: $(INFO_DEPS) + + install-data-am: install-bfdpluginLTLIBRARIES install-data-local \ +- install-info-am install-man ++ install-man + + install-dvi: install-dvi-recursive +