[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] build: resolve conflict with new declaration from version-etc.h
From: |
Jim Meyering |
Subject: |
[PATCH] build: resolve conflict with new declaration from version-etc.h |
Date: |
Fri, 23 Jan 2009 18:38:36 +0100 |
FYI, today's addition in gnulib of emit_bug_reporting_address,
broke coreutils builds, as Bob Proulx noted:
http://buildbot.proulx.com:9000/
Here's the fix I've pushed:
>From 016f8c99984d4a6005eef76d204cd2c396b357d0 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 23 Jan 2009 18:27:36 +0100
Subject: [PATCH] build: resolve conflict with new declaration from version-etc.h
* src/system.h (emit_bug_reporting_address): Define away,
now, gnulib's version-etc.h also declares this function.
In this package, we choose to include each program's name in
the diagnostic. Define away the conflicting declaration.
(emit_bug_reporting_address): Also emit home page and
"General help..." links, like the new function does.
Reported by Bob Proulx.
---
src/system.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/system.h b/src/system.h
index c764405..963ba37 100644
--- a/src/system.h
+++ b/src/system.h
@@ -441,7 +441,11 @@ enum
#include "closein.h"
#include "closeout.h"
+
+#define emit_bug_reporting_address unused__emit_bug_reporting_address
#include "version-etc.h"
+#undef emit_bug_reporting_address
+
#include "propername.h"
/* Define away proper_name (leaving proper_name_utf8, which affects far
fewer programs), since it's not worth the cost of adding ~17KB to
@@ -617,6 +621,10 @@ emit_bug_reporting_address (void)
{
printf (_("\nReport %s bugs to <%s>.\n"), last_component (program_name),
PACKAGE_BUGREPORT);
+ printf (_("%s home page: http://www.gnu.org/software/%s/\n"),
+ PACKAGE_NAME, PACKAGE);
+ printf (_("General help using GNU software: http://www.gnu.org/gethelp/\n"));
+
/* TRANSLATORS: Replace LANG_CODE in this URL with your language code
<http://translationproject.org/team/LANG_CODE.html> to form one of
the URLs at http://translationproject.org/team/. Otherwise, replace
--
1.6.1.399.g0d272
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] build: resolve conflict with new declaration from version-etc.h,
Jim Meyering <=