Configure options --with-bugurl, --with-pkgversion
Joseph S. Myers
joseph@codesourcery.com
Fri Feb 23 07:44:00 GMT 2007
On Tue, 20 Feb 2007, Andreas Schwab wrote:
> Daniel Jacobowitz <drow@false.org> writes:
>
> > On Tue, Feb 20, 2007 at 03:00:01PM +0100, Andreas Schwab wrote:
> >> But that is not what pkgversion is supposed to do, if I understand
> >> <http://gcc.gnu.org/wiki/ConfigVersion> correctly. It should rather
> >> specify an additional version tag (a vendor identifier) _extending_ the
> >> existing one.
> >
> > Perhaps binutils should use the 2.17.50.20070220 notation by default
> > for dated snapshots, as GDB does.
>
> Yes, I agree that this would definitely be a good thing.
This patch implements the suggested change of using "." between
version number and date so that the --version output conforms to the
GNU Coding Standards requirement that the version proper be after the
last space. It makes other fixes for conformance to those standards:
"(GNU Binutils)" is used by default to indicate the common package,
unless overridden by --with-pkgversion specifying another text to go
there; the --version copyright dates are updated (recall that those
dates should just be the most recent year, and don't need to include
any older years), the stray word "version" is removed from the ld
--version output and gprof now uses BFD_VERSION_STRING so it gets the
full version including the date (and meaning the gprof directory no
longer needs a copy of the PKGVERSION configure logic). OK to commit?
bfd:
2007-02-23 Joseph Myers <joseph@codesourcery.com>
* Makefile.am (bfdver.h): Use "." not " " between version number
and date.
* Makefile.in: Regenerate.
* configure.in (PKGVERSION): Default to "(GNU Binutils) ".
* configure: Regenerate.
binutils:
2007-02-23 Joseph Myers <joseph@codesourcery.com>
* version.c (print_version): Update copyright date.
gas:
2007-02-23 Joseph Myers <joseph@codesourcery.com>
* as.c (parse_args): Update copyright date.
gprof:
2007-02-23 Joseph Myers <joseph@codesourcery.com>
* gprof.c: Include bfdver.h
(main): Use BFD_VERSION_STRING for version number and package
name.
* Makefile.am (PKGVERSION): Remove.
(INCLUDES): Update.
Regenerate dependencies.
* Makefile.in: Regenerate.
* configure.in (PKGVERSION): Remove.
* configure: Regenerate.
ld:
2007-02-23 Joseph Myers <joseph@codesourcery.com>
* ldver.c (ldversion): Remove word "version" from output. Update
copyright date.
Index: bfd/Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/Makefile.am,v
retrieving revision 1.187
diff -u -r1.187 Makefile.am
--- bfd/Makefile.am 17 Feb 2007 13:33:52 -0000 1.187
+++ bfd/Makefile.am 23 Feb 2007 03:00:26 -0000
@@ -968,7 +968,7 @@
bfd_version_package="\"$(PKGVERSION)\"" ;\
if test "x$(RELEASE)" = x ; then \
bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
- bfd_version_string="\"$(VERSION) $${bfd_version_date}\"" ;\
+ bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
fi ;\
sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_package@/$$bfd_version_package/" < $(srcdir)/version.h > $@
Index: bfd/configure.in
===================================================================
RCS file: /cvs/src/src/bfd/configure.in,v
retrieving revision 1.221
diff -u -r1.221 configure.in
--- bfd/configure.in 17 Feb 2007 13:33:53 -0000 1.221
+++ bfd/configure.in 23 Feb 2007 03:00:28 -0000
@@ -72,7 +72,7 @@
no) PKGVERSION= ;;
*) PKGVERSION="($withval) " ;;
esac],
- PKGVERSION=
+ PKGVERSION="(GNU Binutils) "
)
AC_SUBST(PKGVERSION)
Index: binutils/version.c
===================================================================
RCS file: /cvs/src/src/binutils/version.c,v
retrieving revision 1.11
diff -u -r1.11 version.c
--- binutils/version.c 8 May 2005 14:17:39 -0000 1.11
+++ binutils/version.c 23 Feb 2007 03:00:28 -0000
@@ -1,6 +1,6 @@
/* version.c -- binutils version information
- Copyright 1991, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
+ Copyright 1991, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2007 Free Software Foundation, Inc.
This file is part of GNU Binutils.
@@ -32,7 +32,7 @@
/* This output is intended to follow the GNU standards document. */
/* xgettext:c-format */
printf ("GNU %s %s\n", name, BFD_VERSION_STRING);
- printf (_("Copyright 2005 Free Software Foundation, Inc.\n"));
+ printf (_("Copyright 2007 Free Software Foundation, Inc.\n"));
printf (_("\
This program is free software; you may redistribute it under the terms of\n\
the GNU General Public License. This program has absolutely no warranty.\n"));
Index: gas/as.c
===================================================================
RCS file: /cvs/src/src/gas/as.c,v
retrieving revision 1.71
diff -u -r1.71 as.c
--- gas/as.c 17 Feb 2007 13:33:55 -0000 1.71
+++ gas/as.c 23 Feb 2007 03:00:28 -0000
@@ -590,7 +590,7 @@
case OPTION_VERSION:
/* This output is intended to follow the GNU standards document. */
printf (_("GNU assembler %s\n"), BFD_VERSION_STRING);
- printf (_("Copyright 2005 Free Software Foundation, Inc.\n"));
+ printf (_("Copyright 2007 Free Software Foundation, Inc.\n"));
printf (_("\
This program is free software; you may redistribute it under the terms of\n\
the GNU General Public License. This program has absolutely no warranty.\n"));
Index: gprof/Makefile.am
===================================================================
RCS file: /cvs/src/src/gprof/Makefile.am,v
retrieving revision 1.31
diff -u -r1.31 Makefile.am
--- gprof/Makefile.am 17 Feb 2007 13:33:57 -0000 1.31
+++ gprof/Makefile.am 23 Feb 2007 03:00:29 -0000
@@ -16,12 +16,10 @@
MKDEP = gcc -MM
-PKGVERSION = "\"@PKGVERSION@\""
REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\""
INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include \
-I$(srcdir)/../bfd @INCINTL@ -I. \
- -DPKGVERSION=$(PKGVERSION) \
-DREPORT_BUGS_TO=$(REPORT_BUGS_TO) \
-DLOCALEDIR="\"$(datadir)/locale\""
@@ -198,116 +196,115 @@
$(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h basic_blocks.h corefile.h gmon_io.h gmon_out.h \
+ gconfig.h basic_blocks.h corefile.h gmon_io.h gmon_out.h \
search_list.h source.h symtab.h sym_ids.h
call_graph.o: call_graph.c gprof.h $(BFDDIR)/sysdep.h \
$(INCDIR)/ansidecl.h ../bfd/config.h $(INCDIR)/fopen-same.h \
$(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
- $(INCDIR)/symcat.h ./gconfig.h search_list.h source.h \
+ $(INCDIR)/symcat.h gconfig.h search_list.h source.h \
symtab.h cg_arcs.h call_graph.h corefile.h gmon_io.h \
gmon_out.h sym_ids.h
cg_arcs.o: cg_arcs.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
$(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
- $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
- search_list.h source.h symtab.h call_graph.h cg_arcs.h \
- cg_dfn.h cg_print.h utils.h sym_ids.h
+ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+ source.h symtab.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \
+ utils.h sym_ids.h
cg_dfn.o: cg_dfn.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
$(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
- $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
- search_list.h source.h symtab.h cg_arcs.h cg_dfn.h \
- utils.h
+ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+ source.h symtab.h cg_arcs.h cg_dfn.h utils.h
cg_print.o: cg_print.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
$(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
- $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
- search_list.h source.h symtab.h cg_arcs.h cg_print.h \
- hist.h utils.h corefile.h
+ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+ source.h symtab.h cg_arcs.h cg_print.h hist.h utils.h \
+ corefile.h
corefile.o: corefile.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
$(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
- $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
- search_list.h source.h symtab.h corefile.h
+ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+ source.h symtab.h corefile.h
gmon_io.o: gmon_io.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+ gconfig.h search_list.h source.h symtab.h cg_arcs.h \
basic_blocks.h corefile.h call_graph.h gmon_io.h gmon_out.h \
gmon.h hertz.h hist.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h
gprof.o: gprof.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
$(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
- $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
+ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h ../bfd/bfdver.h \
search_list.h source.h symtab.h basic_blocks.h call_graph.h \
cg_arcs.h cg_print.h corefile.h gmon_io.h hertz.h hist.h \
sym_ids.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h
hertz.o: hertz.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h hertz.h
+ gconfig.h hertz.h
hist.o: hist.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h ../bfd/config.h \
$(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
- $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h ./gconfig.h \
- search_list.h source.h symtab.h corefile.h gmon_io.h \
- gmon_out.h hist.h sym_ids.h utils.h
+ $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h gconfig.h search_list.h \
+ source.h symtab.h corefile.h gmon_io.h gmon_out.h hist.h \
+ sym_ids.h utils.h
source.o: source.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
+ gconfig.h $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
$(INCDIR)/filenames.h search_list.h source.h
search_list.o: search_list.c $(INCDIR)/libiberty.h \
$(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h search_list.h
+ gconfig.h search_list.h
symtab.o: symtab.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+ gconfig.h search_list.h source.h symtab.h cg_arcs.h \
corefile.h
sym_ids.o: sym_ids.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
$(INCDIR)/safe-ctype.h gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+ gconfig.h search_list.h source.h symtab.h cg_arcs.h \
sym_ids.h
utils.o: utils.c $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
$(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+ gconfig.h search_list.h source.h symtab.h cg_arcs.h \
utils.h
i386.o: i386.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+ gconfig.h search_list.h source.h symtab.h cg_arcs.h \
corefile.h hist.h
alpha.o: alpha.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+ gconfig.h search_list.h source.h symtab.h cg_arcs.h \
corefile.h hist.h
vax.o: vax.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+ gconfig.h search_list.h source.h symtab.h cg_arcs.h \
corefile.h hist.h
tahoe.o: tahoe.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+ gconfig.h search_list.h source.h symtab.h cg_arcs.h \
corefile.h hist.h
sparc.o: sparc.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+ gconfig.h search_list.h source.h symtab.h cg_arcs.h \
corefile.h hist.h
mips.o: mips.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
- ./gconfig.h search_list.h source.h symtab.h cg_arcs.h \
+ gconfig.h search_list.h source.h symtab.h cg_arcs.h \
corefile.h hist.h
flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h
bsd_callg_bl.o: bsd_callg_bl.c $(INCDIR)/ansidecl.h
Index: gprof/configure.in
===================================================================
RCS file: /cvs/src/src/gprof/configure.in,v
retrieving revision 1.32
diff -u -r1.32 configure.in
--- gprof/configure.in 17 Feb 2007 13:33:57 -0000 1.32
+++ gprof/configure.in 23 Feb 2007 03:00:30 -0000
@@ -13,19 +13,6 @@
AM_PROG_LIBTOOL
-# Package version. For an official FSF release, it is empty.
-AC_ARG_WITH(pkgversion,
- AS_HELP_STRING([--with-pkgversion=PKG],
- [Add PKG to the version string]),
- [case "$withval" in
- yes) AC_MSG_ERROR([package version not specified]) ;;
- no) PKGVERSION= ;;
- *) PKGVERSION="($withval) " ;;
- esac],
- PKGVERSION=
-)
-AC_SUBST(PKGVERSION)
-
# The location to which bugs should be reported.
AC_ARG_WITH(bugurl,
AS_HELP_STRING([--with-bugurl=URL],
Index: gprof/gprof.c
===================================================================
RCS file: /cvs/src/src/gprof/gprof.c,v
retrieving revision 1.29
diff -u -r1.29 gprof.c
--- gprof/gprof.c 17 Feb 2007 13:33:57 -0000 1.29
+++ gprof/gprof.c 23 Feb 2007 03:00:30 -0000
@@ -29,6 +29,7 @@
#include "libiberty.h"
#include "gprof.h"
+#include "bfdver.h"
#include "search_list.h"
#include "source.h"
#include "symtab.h"
@@ -411,7 +412,7 @@
break;
case 'v':
/* This output is intended to follow the GNU standards document. */
- printf (_("GNU gprof %s\n"), PKGVERSION VERSION);
+ printf (_("GNU gprof %s\n"), BFD_VERSION_STRING);
printf (_("Based on BSD gprof, copyright 1983 Regents of the University of California.\n"));
printf (_("\
This program is free software. This program has absolutely no warranty.\n"));
Index: ld/ldver.c
===================================================================
RCS file: /cvs/src/src/ld/ldver.c,v
retrieving revision 1.11
diff -u -r1.11 ldver.c
--- ld/ldver.c 12 May 2005 07:32:03 -0000 1.11
+++ ld/ldver.c 23 Feb 2007 03:00:30 -0000
@@ -1,6 +1,6 @@
/* ldver.c -- Print linker version.
Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002,
- 2003 Free Software Foundation, Inc.
+ 2003, 2007 Free Software Foundation, Inc.
This file is part of GLD, the Gnu Linker.
@@ -35,11 +35,11 @@
ldversion (int noisy)
{
/* Output for noisy == 2 is intended to follow the GNU standards. */
- fprintf (stdout, _("GNU ld version %s\n"), BFD_VERSION_STRING);
+ fprintf (stdout, _("GNU ld %s\n"), BFD_VERSION_STRING);
if (noisy & 2)
{
- printf (_("Copyright 2005 Free Software Foundation, Inc.\n"));
+ printf (_("Copyright 2007 Free Software Foundation, Inc.\n"));
printf (_("\
This program is free software; you may redistribute it under the terms of\n\
the GNU General Public License. This program has absolutely no warranty.\n"));
--
Joseph S. Myers
joseph@codesourcery.com
More information about the Binutils
mailing list