Date: Thu, 30 Jul 2020 09:50:01 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543741 - in head/devel/check: . files Message-ID: <202007300950.06U9o1d4073826@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Thu Jul 30 09:50:00 2020 New Revision: 543741 URL: https://svnweb.freebsd.org/changeset/ports/543741 Log: Fix build of dependent ports by reverting [1] - Bump PORTREVISION for package change PR: 248274 [2], 248291 [3] Reported by: mandree [2], shrdlu19@gmail.com [3] Reference: https://github.com/libcheck/check/commit/7ac1fcbcefe8813e2a75388ec61e20a184ddc8c8 [1] Added: head/devel/check/files/patch-src-check.c (contents, props changed) head/devel/check/files/patch-src-check.h.in (contents, props changed) Modified: head/devel/check/Makefile Modified: head/devel/check/Makefile ============================================================================== --- head/devel/check/Makefile Thu Jul 30 09:49:52 2020 (r543740) +++ head/devel/check/Makefile Thu Jul 30 09:50:00 2020 (r543741) @@ -3,6 +3,7 @@ PORTNAME= check PORTVERSION= 0.15.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= sunpoet@FreeBSD.org Added: head/devel/check/files/patch-src-check.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/check/files/patch-src-check.c Thu Jul 30 09:50:00 2020 (r543741) @@ -0,0 +1,43 @@ +Revert: https://github.com/libcheck/check/commit/7ac1fcbcefe8813e2a75388ec61e20a184ddc8c8 + +--- src/check.c.orig 2020-07-22 14:19:48 UTC ++++ src/check.c +@@ -362,24 +362,25 @@ void _mark_point(const char *file, int line) + send_loc_info(file, line); + } + +-void _ck_assert_failed(const char *file, int line, const char *expr, +- const char *msg, ...) ++void _ck_assert_failed(const char *file, int line, const char *expr, ...) + { ++ const char *msg; ++ va_list ap; + char buf[BUFSIZ]; + const char *to_send; + + send_loc_info(file, line); + ++ va_start(ap, expr); ++ msg = (const char *)va_arg(ap, char *); ++ + /* + * If a message was passed, format it with vsnprintf. + * Otherwise, print the expression as is. + */ + if(msg != NULL) + { +- va_list ap; +- va_start(ap, msg); + vsnprintf(buf, BUFSIZ, msg, ap); +- va_end(ap); + to_send = buf; + } + else +@@ -387,6 +388,7 @@ void _ck_assert_failed(const char *file, int line, con + to_send = expr; + } + ++ va_end(ap); + send_failure_info(to_send); + if(cur_fork_status() == CK_FORK) + { Added: head/devel/check/files/patch-src-check.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/check/files/patch-src-check.h.in Thu Jul 30 09:50:00 2020 (r543741) @@ -0,0 +1,48 @@ +Revert: https://github.com/libcheck/check/commit/7ac1fcbcefe8813e2a75388ec61e20a184ddc8c8 + +--- src/check.h.in.orig 2020-07-22 14:19:48 UTC ++++ src/check.h.in +@@ -480,7 +480,7 @@ static void __testname ## _fn (int _i CK_ATTRIBUTE_UNU + */ + #define fail_if(expr, ...)\ + (expr) ? \ +- _ck_assert_failed(__FILE__, __LINE__, "Failure '"#expr"' occurred" , ## __VA_ARGS__) \ ++ _ck_assert_failed(__FILE__, __LINE__, "Failure '"#expr"' occurred" , ## __VA_ARGS__, NULL) \ + : _mark_point(__FILE__, __LINE__) + + /* +@@ -500,12 +500,12 @@ static void __testname ## _fn (int _i CK_ATTRIBUTE_UNU + */ + #if @HAVE_FORK@ + CK_DLL_EXP void CK_EXPORT _ck_assert_failed(const char *file, int line, +- const char *expr, const char *msg, +- ...) CK_ATTRIBUTE_NORETURN CK_ATTRIBUTE_FORMAT(printf, 4, 5); ++ const char *expr, ++ ...) CK_ATTRIBUTE_NORETURN CK_ATTRIBUTE_FORMAT(printf, 3, 4); + #else + CK_DLL_EXP void CK_EXPORT _ck_assert_failed(const char *file, int line, +- const char *expr, const char *msg, +- ...) CK_ATTRIBUTE_FORMAT(printf, 4, 5); ++ const char *expr, ++ ...) CK_ATTRIBUTE_FORMAT(printf, 3, 4); + #endif + + /** +@@ -535,7 +535,7 @@ CK_DLL_EXP void CK_EXPORT _ck_assert_failed(const char + #define ck_assert_msg(expr, ...) \ + (expr) ? \ + _mark_point(__FILE__, __LINE__) : \ +- _ck_assert_failed(__FILE__, __LINE__, "Assertion '"#expr"' failed" , ## __VA_ARGS__) ++ _ck_assert_failed(__FILE__, __LINE__, "Assertion '"#expr"' failed" , ## __VA_ARGS__, NULL) + + /** + * Unconditionally fail the test +@@ -554,7 +554,7 @@ CK_DLL_EXP void CK_EXPORT _ck_assert_failed(const char + * + * @since 0.9.6 + */ +-#define ck_abort_msg(...) _ck_assert_failed(__FILE__, __LINE__, "Failed" , ## __VA_ARGS__) ++#define ck_abort_msg(...) _ck_assert_failed(__FILE__, __LINE__, "Failed" , ## __VA_ARGS__, NULL) + + /* Signed and unsigned integer comparison macros with improved output compared to ck_assert(). */ + /* OP may be any comparison operator. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007300950.06U9o1d4073826>