Date: Wed, 1 Aug 2018 13:39:36 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476181 - in head/sysutils/burp: . files Message-ID: <201808011339.w71Ddasd062811@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Wed Aug 1 13:39:36 2018 New Revision: 476181 URL: https://svnweb.freebsd.org/changeset/ports/476181 Log: sysutils/burp: Fix build with Clang 6 server.c:546:25: error: ordered comparison between pointer and zero ('struct strlist **' and 'int') if(!ret && cconf->keep>0) ~~~~~~~~~~~^~ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475478_s336801/logs/errors/burp-1.4.40_1.log - Remove bad BROKEN tag (util/bdthreads.cc does not exist in burp) Added: head/sysutils/burp/files/patch-src_server.c (contents, props changed) Modified: head/sysutils/burp/Makefile Modified: head/sysutils/burp/Makefile ============================================================================== --- head/sysutils/burp/Makefile Wed Aug 1 13:37:29 2018 (r476180) +++ head/sysutils/burp/Makefile Wed Aug 1 13:39:36 2018 (r476181) @@ -46,10 +46,4 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/vss_strip @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/burp -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 1200039 && ${CC:T} == "clang" -BROKEN= fails to compile due to clang 4.0 regression: util/bdthreads.cc:132:10: ordered comparison between pointer and zero -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Added: head/sysutils/burp/files/patch-src_server.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/burp/files/patch-src_server.c Wed Aug 1 13:39:36 2018 (r476181) @@ -0,0 +1,15 @@ +server.c:546:25: error: ordered comparison between pointer and zero ('struct strlist **' and 'int') + if(!ret && cconf->keep>0) + ~~~~~~~~~~~^~ + +--- src/server.c.orig 2018-08-01 13:34:56 UTC ++++ src/server.c +@@ -543,7 +543,7 @@ static int do_backup_server(const char *basedir, const + working, current, currentdata, + finishing, cconf, client, + p1cntr, cntr); +- if(!ret && cconf->keep>0) ++ if(!ret && cconf->keep != NULL) + ret=remove_old_backups(basedir, cconf, client); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808011339.w71Ddasd062811>