Date: Wed, 8 Jan 2014 11:41:10 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r339102 - branches/2014Q1/textproc/p5-Text-ClearSilver/files Message-ID: <201401081141.s08BfACn044724@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Jan 8 11:41:10 2014 New Revision: 339102 URL: http://svnweb.freebsd.org/changeset/ports/339102 Log: MFH: r338312 - Unbreak on 10.x (clang only environment). Added: branches/2014Q1/textproc/p5-Text-ClearSilver/files/patch-noe_err.h - copied unchanged from r338312, head/textproc/p5-Text-ClearSilver/files/patch-noe_err.h branches/2014Q1/textproc/p5-Text-ClearSilver/files/patch-rules.mk.in - copied unchanged from r338312, head/textproc/p5-Text-ClearSilver/files/patch-rules.mk.in Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/textproc/p5-Text-ClearSilver/files/patch-noe_err.h (from r338312, head/textproc/p5-Text-ClearSilver/files/patch-noe_err.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/textproc/p5-Text-ClearSilver/files/patch-noe_err.h Wed Jan 8 11:41:10 2014 (r339102, copy of r338312, head/textproc/p5-Text-ClearSilver/files/patch-noe_err.h) @@ -0,0 +1,29 @@ +--- cs/util/neo_err.h.orig 2013-12-31 23:09:45.821123833 +0900 ++++ cs/util/neo_err.h 2013-12-31 23:16:18.810123255 +0900 +@@ -85,7 +85,7 @@ + */ + #if defined(USE_C99_VARARG_MACROS) + #define nerr_raise(e,f,...) \ +- nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__) ++ nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,## __VA_ARGS__) + #elif defined(USE_GNUC_VARARG_MACROS) + #define nerr_raise(e,f,a...) \ + nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a) +@@ -99,7 +99,7 @@ + + #if defined(USE_C99_VARARG_MACROS) + #define nerr_raise_errno(e,f,...) \ +- nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__) ++ nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,## __VA_ARGS__) + #elif defined(USE_GNUC_VARARG_MACROS) + #define nerr_raise_errno(e,f,a...) \ + nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a) +@@ -139,7 +139,7 @@ + */ + #if defined(USE_C99_VARARG_MACROS) + #define nerr_pass_ctx(e,f,...) \ +- nerr_pass_ctxf(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__) ++ nerr_pass_ctxf(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,## __VA_ARGS__) + #elif defined(USE_GNUC_VARARG_MACROS) + #define nerr_pass_ctx(e,f,a...) \ + nerr_pass_ctxf(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a) Copied: branches/2014Q1/textproc/p5-Text-ClearSilver/files/patch-rules.mk.in (from r338312, head/textproc/p5-Text-ClearSilver/files/patch-rules.mk.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/textproc/p5-Text-ClearSilver/files/patch-rules.mk.in Wed Jan 8 11:41:10 2014 (r339102, copy of r338312, head/textproc/p5-Text-ClearSilver/files/patch-rules.mk.in) @@ -0,0 +1,11 @@ +--- cs/rules.mk.in.orig 2013-12-31 22:42:58.734123396 +0900 ++++ cs/rules.mk.in 2013-12-31 22:43:10.268123883 +0900 +@@ -158,7 +158,7 @@ + @touch Makefile.depends + @if test "x" != "x$(SOURCE_FILES)"; then \ + for II in "$(SOURCE_FILES)"; do \ +- gcc -M -MG ${CFLAGS} $$II >> Makefile.depends; \ ++ ${CC} -M -MG ${CFLAGS} $$II >> Makefile.depends; \ + done; \ + fi + @echo "** (done) "
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401081141.s08BfACn044724>