From owner-svn-ports-head@freebsd.org Tue Feb 26 19:08:44 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3795615003C6; Tue, 26 Feb 2019 19:08:44 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9F4FD6E6FB; Tue, 26 Feb 2019 19:08:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 889C6961A; Tue, 26 Feb 2019 19:08:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1QJ8hTk003163; Tue, 26 Feb 2019 19:08:43 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1QJ8htq003162; Tue, 26 Feb 2019 19:08:43 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201902261908.x1QJ8htq003162@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 26 Feb 2019 19:08:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493979 - in head/devel/jsoncpp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in head/devel/jsoncpp: . files X-SVN-Commit-Revision: 493979 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9F4FD6E6FB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2019 19:08:44 -0000 Author: dim (src committer) Date: Tue Feb 26 19:08:42 2019 New Revision: 493979 URL: https://svnweb.freebsd.org/changeset/ports/493979 Log: With libc++ 8.0, which is in the projects/clang800-import branch, and which will soon be merged to head, compilation of devel/jsoncpp fails due to a conflict between the new C++ header, and a local file "version" which is produced by jsoncpp during its configure phase. This is due to the initial test runner being compiled with "-I.", even though it does not need any file from the port's working directory root. Therefore, it seems to be easiest to comment out the line from the SConstruct script that adds the "-I." option. Approved by: yuri (maintainer) PR: 236061 MFH: 2019Q1 Modified: head/devel/jsoncpp/Makefile head/devel/jsoncpp/files/patch-SConstruct Modified: head/devel/jsoncpp/Makefile ============================================================================== --- head/devel/jsoncpp/Makefile Tue Feb 26 18:57:58 2019 (r493978) +++ head/devel/jsoncpp/Makefile Tue Feb 26 19:08:42 2019 (r493979) @@ -3,7 +3,7 @@ PORTNAME= jsoncpp PORTVERSION= 1.8.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org Modified: head/devel/jsoncpp/files/patch-SConstruct ============================================================================== --- head/devel/jsoncpp/files/patch-SConstruct Tue Feb 26 18:57:58 2019 (r493978) +++ head/devel/jsoncpp/files/patch-SConstruct Tue Feb 26 19:08:42 2019 (r493979) @@ -38,7 +38,7 @@ if 'TarGz' in env['BUILDERS']: class SrcDistAdder: def __init__( self, env ): -@@ -164,7 +170,7 @@ env['SRCDIST_ADD'] = SrcDistAdder( env ) +@@ -164,11 +170,11 @@ env['SRCDIST_ADD'] = SrcDistAdder( env ) env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] ) env_testing = env.Clone( ) @@ -47,6 +47,11 @@ def buildJSONExample( env, target_sources, target_name ): env = env.Clone() +- env.Append( CPPPATH = ['#'] ) ++ #env.Append( CPPPATH = ['#'] ) + exe = env.Program( target=target_name, + source=target_sources ) + env['SRCDIST_ADD']( source=[target_sources] ) @@ -187,14 +193,14 @@ def buildUnitTests( env, target_sources, env.AlwaysBuild( check_alias_target )