From 9e68eafb5ba0c4b17e0ce48896ad0c3369d850e7 Mon Sep 17 00:00:00 2001 From: John Marino Date: Fri, 3 Apr 2015 10:12:43 +0200 Subject: [PATCH] binutils 2.24: Remove info pages The info pages from binutils 2.25 are not installed (if they were, they would overwrite 2.24 versions anyway). Both "as" and "ld" have sufficient man pages. There is not equivalent "binutils" man page, but this information is readily available on the internet, which is the same justification used for not importing gcc50 info pages. --- Makefile_upgrade.inc | 3 + gnu/usr.bin/binutils224/Makefile | 2 +- gnu/usr.bin/binutils224/doc/Makefile | 38 ------------ gnu/usr.bin/binutils224/doc/asconfig.texi | 70 ----------------------- 4 files changed, 4 insertions(+), 109 deletions(-) delete mode 100644 gnu/usr.bin/binutils224/doc/Makefile delete mode 100644 gnu/usr.bin/binutils224/doc/asconfig.texi diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index aed1b7c835..c7165fefd2 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -3018,6 +3018,9 @@ TO_REMOVE+=/usr/share/nls/zh_TW.Big5 TO_REMOVE+=/usr/share/nls/zh_TW.UTF-8 TO_REMOVE+=/usr/share/info/cvs.info.gz TO_REMOVE+=/usr/share/info/cvsclient.info.gz +TO_REMOVE+=/usr/share/info/as.info.gz +TO_REMOVE+=/usr/share/info/binutils.info.gz +TO_REMOVE+=/usr/share/info/ld.info.gz .if ${MACHINE_ARCH} == "x86_64" TO_REMOVE+=/usr/sbin/stlstats diff --git a/gnu/usr.bin/binutils224/Makefile b/gnu/usr.bin/binutils224/Makefile index b3f621cc3f..e7c428689f 100644 --- a/gnu/usr.bin/binutils224/Makefile +++ b/gnu/usr.bin/binutils224/Makefile @@ -1,6 +1,6 @@ SUBDIR= libiberty libbfd libopcodes libbinutils \ addr2line ar as ld nm objcopy objdump ranlib readelf \ - elfedit size strings strip doc cxxfilt gprof \ + elfedit size strings strip cxxfilt gprof \ libgold gold incdump TARGET_ARCH?= ${MACHINE_ARCH} diff --git a/gnu/usr.bin/binutils224/doc/Makefile b/gnu/usr.bin/binutils224/doc/Makefile deleted file mode 100644 index e764345988..0000000000 --- a/gnu/usr.bin/binutils224/doc/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -.include "../Makefile.inc0" - -CONTRIBDIR= ${.CURDIR}/../../../../contrib - -.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc - -INFO = as ld binutils -INFOSECTION= "Programming & development tools." -INFOENTRY_as= "* As: (as). The GNU assembler." -INFOENTRY_ld= "* Ld: (ld). The GNU linker." -INFOENTRY_binutils= "* Binutils: (binutils). The GNU Binary Utilities." - -MAKEINFOFLAGS+= --no-validate -MAKEINFOFLAGS+= -I ${SRCDIR}/gas/doc -I ${SRCDIR}/ld -I ${SRCDIR}/bfd/doc -MAKEINFOFLAGS+= -I ${SRCDIR}/binutils -I ${SRCDIR}/libiberty -MAKEINFOFLAGS+= -I ${CONTRIBDIR}/libreadline/doc - -CLEANFILES= config.texi configdoc.texi inc-hist.texi \ - inc-hist.texi.orig gasver.texi ldver.texi - -as.info: as.texinfo asconfig.texi c-i386.texi gasver.texi -ld.info: ld.texinfo bfdsumm.texi ldver.texi configdoc.texi - -configdoc.texi: gen-doc.texi - ${LN} -sf ${.ALLSRC} ${.TARGET} - -.PATH: ${SRCDIR}/binutils/doc -binutils.info: binutils.texi config.texi - -config.texi gasver.texi ldver.texi: - echo "@set VERSION ${VERSION}" > ${.TARGET} - -.PATH: ${CONTRIBDIR}/libreadline/doc -inc-hist.texi: hsuser.texinfo inc-hist.diff - cp ${.ALLSRC:M*.texinfo} ${.TARGET} - patch --suffix=.orig < ${.ALLSRC:M*.diff} - -.include diff --git a/gnu/usr.bin/binutils224/doc/asconfig.texi b/gnu/usr.bin/binutils224/doc/asconfig.texi deleted file mode 100644 index 2a7b652f83..0000000000 --- a/gnu/usr.bin/binutils224/doc/asconfig.texi +++ /dev/null @@ -1,70 +0,0 @@ -@c Copyright 1992, 1993 Free Software Foundation, Inc. -@c This file is part of the documentation for the GAS manual - -@c Configuration settings for all-inclusive version of manual - -@c switches:------------------------------------------------------------ -@c Properties of the manual -@c ======================== -@c Discuss all architectures? -@clear ALL-ARCH -@c A generic form of manual (not tailored to specific target)? -@clear GENERIC -@c Include text on assembler internals? -@set INTERNALS -@c Many object formats supported in this config? -@clear MULTI-OBJ - -@c Object formats of interest -@c ========================== -@clear AOUT -@clear BOUT -@clear COFF -@set ELF -@clear SOM - -@c CPUs of interest -@c ================ -@clear A29K -@clear ARC -@clear ARM -@clear D10V -@clear H8/300 -@clear H8/500 -@clear SH -@set I80386 -@clear I960 -@clear MIPS -@clear M32R -@clear M680X0 -@clear Z8000 -@clear SPARC -@clear VAX -@clear VXWORKS -@clear HPPA -@clear V850 - -@c Does this version of the assembler use the difference-table kluge? -@clear DIFF-TBL-KLUGE - -@c Do all machines described use IEEE floating point? -@set IEEEFLOAT - -@c Is a word 32 bits, or 16? -@set W32 -@clear W16 - -@c Do symbols have different characters than usual? -@clear SPECIAL-SYMS - -@c strings:------------------------------------------------------------ -@c Name of the assembler: -@set AS as -@c Name of C compiler: -@set GCC gcc -@c Name of linker: -@set LD ld -@c Text for target machine (best not used in generic case; but just in case...) -@set TARGET i386 -@c Name of object format (NOT SET in generic version) -@set OBJ-NAME ELF -- 2.41.0