vapier 15/04/30 07:02:19 Modified: README.history Added: 002_all_coreutils-printf-macro.patch Log: add fix from upstream for building w/clang found via Chromium OS
Revision Changes Path 1.2 src/patchsets/coreutils/8.23/README.history file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.23/README.history?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.23/README.history?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.23/README.history?r1=1.1&r2=1.2 Index: README.history =================================================================== RCS file: /var/cvsroot/gentoo/src/patchsets/coreutils/8.23/README.history,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.history 28 Jul 2014 09:43:14 -0000 1.1 +++ README.history 30 Apr 2015 07:02:19 -0000 1.2 @@ -1,3 +1,6 @@ +1.1 30 Apr 2014 + + 002_all_coreutils-printf-macro.patch + 1.0 28 Jul 2014 + 003_all_coreutils-gentoo-uname.patch + 010_all_coreutils-tests.patch 1.1 src/patchsets/coreutils/8.23/002_all_coreutils-printf-macro.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.23/002_all_coreutils-printf-macro.patch?rev=1.1&view=markup 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 Index: 002_all_coreutils-printf-macro.patch =================================================================== >From c77a96ccba91ca687fe0c22e3b2bb1141fbab421 Mon Sep 17 00:00:00 2001 From: Yunlian Jiang <[email protected]> Date: Tue, 28 Apr 2015 23:47:20 +0100 Subject: [PATCH] build: fix SINGLE_BINARY build when printf is a macro * src/coreutils.c (usage): include coreutils.h outside the printf call, because if it's a macro you will get the error: embedding a #include directive within macro arguments is not supported --- src/coreutils.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/coreutils.c b/src/coreutils.c index 9f798b8..7f86834 100644 --- a/src/coreutils.c +++ b/src/coreutils.c @@ -70,15 +70,17 @@ Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - printf ("\n\ -Built-in programs:\n" #ifdef SINGLE_BINARY -/* XXX: Ideally we#d like to present "install" here, not "ginstall". */ +/* XXX: Ideally we'd like to present "install" here, not "ginstall". */ + char const *prog_name_list = # define SINGLE_BINARY_PROGRAM(prog_name_str, main_name) " " prog_name_str # include "coreutils.h" # undef SINGLE_BINARY_PROGRAM + ; + printf ("\n\ +Built-in programs:\n\ +%s\n", prog_name_list); #endif - "\n"); printf (_("\ \n\ -- 2.3.6
