This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: Support --with-pkgversion and --with-bugurl
On Wed, 7 Nov 2012, Roland McGrath wrote:
> > @@ -52,10 +52,8 @@ extern void *xrealloc (void *o, size_t n)
> > static void print_version (FILE *stream, struct argp_state *state);
> > void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
> >
> > -/* Bug report address. */
> > -const char *argp_program_bug_address = N_("\
> > -For bug reporting instructions, please see:\n\
> > -<http://www.gnu.org/software/libc/bugs.html>.\n");
> > +/* Function to print some extra text in the help message. */
> > +static char *more_help (int key, const char *text, void *input);
>
> Why is it necessary to change this from argp_program_bug_address to
> more_help? What's the difference in output between the two?
The change is needed because the "For bug reporting instructions, please
see" part should be internationalized, but the actual URL depends on
--with-pkgversion - using string concatenation to insert REPORT_BUGS_TO
here would break internationalization (since translations are of constant
strings, not strings containing bits depending on configure options),
hence the move to the approach used by the other argp-using programs which
allows REPORT_BUGS_TO to be inserted at runtime using asprintf with the
translated format string.
> Why bake a default in here? I presume it's just for the INSTALL
> formatting. It would be better to use pkgvers.texi here too, with
> whatever macro fiddles are easiest to either avoid or make harmless
> the multiple inclusion.
Will a dependency on $(common-objpfx)manual/pkgvers.texi work as-is in the
toplevel Makefile where the INSTALL rule is, or is something extra needed
for that to use manual/Makefile to build the file if it doesn't already
exist?
> > @@ -36,7 +38,8 @@ This file documents @theglibc{}.
> > This is
> > @c Disabled (printed editions, see above).
> > @c Edition @value{EDITION} of
> > -@cite{The GNU C Library Reference Manual}, for version @value{VERSION}.
> > +@cite{The GNU C Library Reference Manual}, for version @value{VERSION}
> > +@value{PKGVERSION}.
>
> In default configuration this is going to say, "for version 2.17
> (GNU libc) ". That's not what we want. All the instances in the
> manual should be omitted entirely if it's the default setting.
I'll do something similar to how GDB handles such an issue (special
treatment of the default bug-reporting URL, in that case).
> > --- a/timezone/tzselect.ksh
> > +++ b/timezone/tzselect.ksh
>
> This script is barely changed from tzcode.
> We should try to reharmonize before we diverge further.
I'll do another update of the files taken from tzcode.
--
Joseph S. Myers
joseph@codesourcery.com