| 1 |
vapier 15/04/30 07:02:19 |
| 2 |
|
| 3 |
Modified: README.history |
| 4 |
Added: 002_all_coreutils-printf-macro.patch |
| 5 |
Log: |
| 6 |
add fix from upstream for building w/clang found via Chromium OS |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 src/patchsets/coreutils/8.23/README.history |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.23/README.history?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.23/README.history?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.23/README.history?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: README.history |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/coreutils/8.23/README.history,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- README.history 28 Jul 2014 09:43:14 -0000 1.1 |
| 22 |
+++ README.history 30 Apr 2015 07:02:19 -0000 1.2 |
| 23 |
@@ -1,3 +1,6 @@ |
| 24 |
+1.1 30 Apr 2014 |
| 25 |
+ + 002_all_coreutils-printf-macro.patch |
| 26 |
+ |
| 27 |
1.0 28 Jul 2014 |
| 28 |
+ 003_all_coreutils-gentoo-uname.patch |
| 29 |
+ 010_all_coreutils-tests.patch |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 src/patchsets/coreutils/8.23/002_all_coreutils-printf-macro.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.23/002_all_coreutils-printf-macro.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.23/002_all_coreutils-printf-macro.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: 002_all_coreutils-printf-macro.patch |
| 39 |
=================================================================== |
| 40 |
From c77a96ccba91ca687fe0c22e3b2bb1141fbab421 Mon Sep 17 00:00:00 2001 |
| 41 |
From: Yunlian Jiang <yunlian@××××××××.org> |
| 42 |
Date: Tue, 28 Apr 2015 23:47:20 +0100 |
| 43 |
Subject: [PATCH] build: fix SINGLE_BINARY build when printf is a macro |
| 44 |
|
| 45 |
* src/coreutils.c (usage): include coreutils.h outside |
| 46 |
the printf call, because if it's a macro you will get the error: |
| 47 |
embedding a #include directive within macro arguments is not supported |
| 48 |
--- |
| 49 |
src/coreutils.c | 10 ++++++---- |
| 50 |
1 file changed, 6 insertions(+), 4 deletions(-) |
| 51 |
|
| 52 |
diff --git a/src/coreutils.c b/src/coreutils.c |
| 53 |
index 9f798b8..7f86834 100644 |
| 54 |
--- a/src/coreutils.c |
| 55 |
+++ b/src/coreutils.c |
| 56 |
@@ -70,15 +70,17 @@ Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n\ |
| 57 |
fputs (HELP_OPTION_DESCRIPTION, stdout); |
| 58 |
fputs (VERSION_OPTION_DESCRIPTION, stdout); |
| 59 |
|
| 60 |
- printf ("\n\ |
| 61 |
-Built-in programs:\n" |
| 62 |
#ifdef SINGLE_BINARY |
| 63 |
-/* XXX: Ideally we#d like to present "install" here, not "ginstall". */ |
| 64 |
+/* XXX: Ideally we'd like to present "install" here, not "ginstall". */ |
| 65 |
+ char const *prog_name_list = |
| 66 |
# define SINGLE_BINARY_PROGRAM(prog_name_str, main_name) " " prog_name_str |
| 67 |
# include "coreutils.h" |
| 68 |
# undef SINGLE_BINARY_PROGRAM |
| 69 |
+ ; |
| 70 |
+ printf ("\n\ |
| 71 |
+Built-in programs:\n\ |
| 72 |
+%s\n", prog_name_list); |
| 73 |
#endif |
| 74 |
- "\n"); |
| 75 |
|
| 76 |
printf (_("\ |
| 77 |
\n\ |
| 78 |
-- |
| 79 |
2.3.6 |
Archives