Rename binutils221 to binutils224 as a new makefile base
authorJohn Marino <draco@marino.st>
Fri, 6 Dec 2013 13:35:06 +0000 (14:35 +0100)
committerJohn Marino <draco@marino.st>
Fri, 6 Dec 2013 15:16:41 +0000 (16:16 +0100)
* This immediately breaks binutils221 which will be removed imminently
* This temporarily breaks the build completely
* Makefile.buo was realigned to respect 75 characters
* Makefile.buo was tweaked to minimum necessary updates by using :S modifier
* Makefile.buo extra ".else" branches were removed
* NO_BINUTILS221 will be replaced with NO_ALTBINUTILS, this is first step

67 files changed:
gnu/usr.bin/Makefile
gnu/usr.bin/Makefile.buo
gnu/usr.bin/binutils224/Makefile [moved from gnu/usr.bin/binutils221/Makefile with 100% similarity]
gnu/usr.bin/binutils224/Makefile.bu [moved from gnu/usr.bin/binutils221/Makefile.bu with 100% similarity]
gnu/usr.bin/binutils224/Makefile.inc [moved from gnu/usr.bin/binutils221/Makefile.inc with 100% similarity]
gnu/usr.bin/binutils224/Makefile.inc0 [moved from gnu/usr.bin/binutils221/Makefile.inc0 with 100% similarity]
gnu/usr.bin/binutils224/Makefile.inc1 [moved from gnu/usr.bin/binutils221/Makefile.inc1 with 100% similarity]
gnu/usr.bin/binutils224/addr2line/Makefile [moved from gnu/usr.bin/binutils221/addr2line/Makefile with 100% similarity]
gnu/usr.bin/binutils224/ar/Makefile [moved from gnu/usr.bin/binutils221/ar/Makefile with 100% similarity]
gnu/usr.bin/binutils224/as/Makefile [moved from gnu/usr.bin/binutils221/as/Makefile with 100% similarity]
gnu/usr.bin/binutils224/as/Makefile.inc [moved from gnu/usr.bin/binutils221/as/Makefile.inc with 100% similarity]
gnu/usr.bin/binutils224/as/Makefile.inc0 [moved from gnu/usr.bin/binutils221/as/Makefile.inc0 with 100% similarity]
gnu/usr.bin/binutils224/as/config.h [moved from gnu/usr.bin/binutils221/as/config.h with 100% similarity]
gnu/usr.bin/binutils224/as/i386-dragonfly/Makefile [moved from gnu/usr.bin/binutils221/as/i386-dragonfly/Makefile with 100% similarity]
gnu/usr.bin/binutils224/as/i386-dragonfly/obj-format.h [moved from gnu/usr.bin/binutils221/as/i386-dragonfly/obj-format.h with 100% similarity]
gnu/usr.bin/binutils224/as/i386-dragonfly/targ-cpu.h [moved from gnu/usr.bin/binutils221/as/i386-dragonfly/targ-cpu.h with 100% similarity]
gnu/usr.bin/binutils224/as/i386-dragonfly/targ-env.h [moved from gnu/usr.bin/binutils221/as/i386-dragonfly/targ-env.h with 100% similarity]
gnu/usr.bin/binutils224/as/x86_64-dragonfly/Makefile [moved from gnu/usr.bin/binutils221/as/x86_64-dragonfly/Makefile with 100% similarity]
gnu/usr.bin/binutils224/as/x86_64-dragonfly/itbl-cpu.h [moved from gnu/usr.bin/binutils221/as/x86_64-dragonfly/itbl-cpu.h with 100% similarity]
gnu/usr.bin/binutils224/as/x86_64-dragonfly/obj-format.h [moved from gnu/usr.bin/binutils221/as/x86_64-dragonfly/obj-format.h with 100% similarity]
gnu/usr.bin/binutils224/as/x86_64-dragonfly/targ-cpu.h [moved from gnu/usr.bin/binutils221/as/x86_64-dragonfly/targ-cpu.h with 100% similarity]
gnu/usr.bin/binutils224/as/x86_64-dragonfly/targ-env.h [moved from gnu/usr.bin/binutils221/as/x86_64-dragonfly/targ-env.h with 100% similarity]
gnu/usr.bin/binutils224/cxxfilt/Makefile [moved from gnu/usr.bin/binutils221/cxxfilt/Makefile with 100% similarity]
gnu/usr.bin/binutils224/cxxfilt/c++filt.1 [moved from gnu/usr.bin/binutils221/cxxfilt/c++filt.1 with 100% similarity]
gnu/usr.bin/binutils224/doc/Makefile [moved from gnu/usr.bin/binutils221/doc/Makefile with 100% similarity]
gnu/usr.bin/binutils224/doc/asconfig.texi [moved from gnu/usr.bin/binutils221/doc/asconfig.texi with 100% similarity]
gnu/usr.bin/binutils224/elfedit/Makefile [moved from gnu/usr.bin/binutils221/elfedit/Makefile with 100% similarity]
gnu/usr.bin/binutils224/gold/Makefile [moved from gnu/usr.bin/binutils221/gold/Makefile with 100% similarity]
gnu/usr.bin/binutils224/gold/Makefile.i386 [moved from gnu/usr.bin/binutils221/gold/Makefile.i386 with 100% similarity]
gnu/usr.bin/binutils224/gold/Makefile.x86_64 [moved from gnu/usr.bin/binutils221/gold/Makefile.x86_64 with 100% similarity]
gnu/usr.bin/binutils224/gprof/Makefile [moved from gnu/usr.bin/binutils221/gprof/Makefile with 100% similarity]
gnu/usr.bin/binutils224/gprof/gconfig.h [moved from gnu/usr.bin/binutils221/gprof/gconfig.h with 100% similarity]
gnu/usr.bin/binutils224/gprof/gprof.1 [moved from gnu/usr.bin/binutils221/gprof/gprof.1 with 100% similarity]
gnu/usr.bin/binutils224/ld/Makefile [moved from gnu/usr.bin/binutils221/ld/Makefile with 100% similarity]
gnu/usr.bin/binutils224/ld/Makefile.i386 [moved from gnu/usr.bin/binutils221/ld/Makefile.i386 with 100% similarity]
gnu/usr.bin/binutils224/ld/Makefile.x86_64 [moved from gnu/usr.bin/binutils221/ld/Makefile.x86_64 with 100% similarity]
gnu/usr.bin/binutils224/ld/config.h [moved from gnu/usr.bin/binutils221/ld/config.h with 100% similarity]
gnu/usr.bin/binutils224/libbfd/Makefile [moved from gnu/usr.bin/binutils221/libbfd/Makefile with 100% similarity]
gnu/usr.bin/binutils224/libbfd/Makefile.host.i386 [moved from gnu/usr.bin/binutils221/libbfd/Makefile.host.i386 with 100% similarity]
gnu/usr.bin/binutils224/libbfd/Makefile.host.x86_64 [moved from gnu/usr.bin/binutils221/libbfd/Makefile.host.x86_64 with 100% similarity]
gnu/usr.bin/binutils224/libbfd/Makefile.i386 [moved from gnu/usr.bin/binutils221/libbfd/Makefile.i386 with 100% similarity]
gnu/usr.bin/binutils224/libbfd/Makefile.x86_64 [moved from gnu/usr.bin/binutils221/libbfd/Makefile.x86_64 with 100% similarity]
gnu/usr.bin/binutils224/libbfd/config.h [moved from gnu/usr.bin/binutils221/libbfd/config.h with 100% similarity]
gnu/usr.bin/binutils224/libbinutils/Makefile [moved from gnu/usr.bin/binutils221/libbinutils/Makefile with 100% similarity]
gnu/usr.bin/binutils224/libbinutils/Makefile.i386 [moved from gnu/usr.bin/binutils221/libbinutils/Makefile.i386 with 100% similarity]
gnu/usr.bin/binutils224/libbinutils/Makefile.x86_64 [moved from gnu/usr.bin/binutils221/libbinutils/Makefile.x86_64 with 100% similarity]
gnu/usr.bin/binutils224/libbinutils/config.h [moved from gnu/usr.bin/binutils221/libbinutils/config.h with 100% similarity]
gnu/usr.bin/binutils224/libgold/Makefile [moved from gnu/usr.bin/binutils221/libgold/Makefile with 100% similarity]
gnu/usr.bin/binutils224/libgold/Makefile.i386 [moved from gnu/usr.bin/binutils221/libgold/Makefile.i386 with 100% similarity]
gnu/usr.bin/binutils224/libgold/Makefile.x86_64 [moved from gnu/usr.bin/binutils221/libgold/Makefile.x86_64 with 100% similarity]
gnu/usr.bin/binutils224/libgold/config.h [moved from gnu/usr.bin/binutils221/libgold/config.h with 100% similarity]
gnu/usr.bin/binutils224/libgold/yyscript.c [moved from gnu/usr.bin/binutils221/libgold/yyscript.c with 100% similarity]
gnu/usr.bin/binutils224/libgold/yyscript.h [moved from gnu/usr.bin/binutils221/libgold/yyscript.h with 100% similarity]
gnu/usr.bin/binutils224/libiberty/Makefile [moved from gnu/usr.bin/binutils221/libiberty/Makefile with 100% similarity]
gnu/usr.bin/binutils224/libiberty/config.h [moved from gnu/usr.bin/binutils221/libiberty/config.h with 100% similarity]
gnu/usr.bin/binutils224/libopcodes/Makefile [moved from gnu/usr.bin/binutils221/libopcodes/Makefile with 100% similarity]
gnu/usr.bin/binutils224/libopcodes/Makefile.i386 [moved from gnu/usr.bin/binutils221/libopcodes/Makefile.i386 with 100% similarity]
gnu/usr.bin/binutils224/libopcodes/Makefile.x86_64 [moved from gnu/usr.bin/binutils221/libopcodes/Makefile.x86_64 with 100% similarity]
gnu/usr.bin/binutils224/libopcodes/config.h [moved from gnu/usr.bin/binutils221/libopcodes/config.h with 100% similarity]
gnu/usr.bin/binutils224/nm/Makefile [moved from gnu/usr.bin/binutils221/nm/Makefile with 100% similarity]
gnu/usr.bin/binutils224/objcopy/Makefile [moved from gnu/usr.bin/binutils221/objcopy/Makefile with 100% similarity]
gnu/usr.bin/binutils224/objdump/Makefile [moved from gnu/usr.bin/binutils221/objdump/Makefile with 100% similarity]
gnu/usr.bin/binutils224/ranlib/Makefile [moved from gnu/usr.bin/binutils221/ranlib/Makefile with 100% similarity]
gnu/usr.bin/binutils224/readelf/Makefile [moved from gnu/usr.bin/binutils221/readelf/Makefile with 100% similarity]
gnu/usr.bin/binutils224/size/Makefile [moved from gnu/usr.bin/binutils221/size/Makefile with 100% similarity]
gnu/usr.bin/binutils224/strings/Makefile [moved from gnu/usr.bin/binutils221/strings/Makefile with 100% similarity]
gnu/usr.bin/binutils224/strip/Makefile [moved from gnu/usr.bin/binutils221/strip/Makefile with 100% similarity]

index a15847f..0a1489e 100644 (file)
@@ -13,7 +13,7 @@ SUBDIR+=gdb
 .endif
 
 SUBDIR+= ${BU_PRIMARY}
-.if !defined(NO_BINUTILS221)
+.if !defined(NO_ALTBINUTILS)
 SUBDIR+= ${BU_BACKUP}
 .endif
 
index d1fac85..49aa4fc 100644 (file)
@@ -1,23 +1,24 @@
-# DragonFly maintains two sets of binutils.  The last time it was necessary to swap the primary and
-# backup status between them, 37 files had to be changed.  This makefile include aims to make that process
-# much simpler by having common variables located in one place to control the state.
+# DragonFly maintains two sets of binutils.  The last time it was
+# necessary to swap the primary and backup status between them, 37 files
+# had to be changed.  This makefile include aims to make that process much
+# simpler by having common variables located in one place to control the
+# state.
 #
-# Additionally, with each new import or upgrade of binutils, dozens of Makefiles have to be individually
-# customized over the previous version.  Ideally in the future the Makefiles are generic and only have to be
+# Additionally, with each new import or upgrade of binutils, dozens of
+# Makefiles have to be individually customized over the previous version.
+# Ideally in the future the Makefiles are generic and only have to be
 # copied over in most cases.
 
 BU_PRIMARY=    binutils222
-BU_BACKUP=     binutils221
+BU_BACKUP=     binutils224
 
 .if defined(BUVERSION)
 .if (${BUVERSION} == ${BU_PRIMARY})
 IS_PRIMARY=    1
-MANPAGEVER=    222
-.else
+MANPAGEVER=    ${BU_PRIMARY:S/binutils//}
 .endif
 
 .if (${BUVERSION} == ${BU_BACKUP})
-MANPAGEVER=    221
-.else
+MANPAGEVER=    ${BU_BACKUP:S/binutils//}
 .endif
 .endif