From owner-svn-ports-all@freebsd.org Wed Feb 27 21:50:18 2019 Return-Path: Delivered-To: svn-ports-all@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 26F2915061E2; Wed, 27 Feb 2019 21:50:18 +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 B98EA91721; Wed, 27 Feb 2019 21:50:17 +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 A883722C6D; Wed, 27 Feb 2019 21:50:17 +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 x1RLoHX2047631; Wed, 27 Feb 2019 21:50:17 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1RLoHcA047630; Wed, 27 Feb 2019 21:50:17 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201902272150.x1RLoHcA047630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 27 Feb 2019 21:50:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r494088 - in branches/2019Q1/devel/jsoncpp: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in branches/2019Q1/devel/jsoncpp: . files X-SVN-Commit-Revision: 494088 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B98EA91721 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.984,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2019 21:50:18 -0000 Author: dim (src committer) Date: Wed Feb 27 21:50:17 2019 New Revision: 494088 URL: https://svnweb.freebsd.org/changeset/ports/494088 Log: MFH: r493979 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: portmgr (joneum) PR: 236061 Modified: branches/2019Q1/devel/jsoncpp/Makefile branches/2019Q1/devel/jsoncpp/files/patch-SConstruct Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/devel/jsoncpp/Makefile ============================================================================== --- branches/2019Q1/devel/jsoncpp/Makefile Wed Feb 27 21:41:48 2019 (r494087) +++ branches/2019Q1/devel/jsoncpp/Makefile Wed Feb 27 21:50:17 2019 (r494088) @@ -3,7 +3,7 @@ PORTNAME= jsoncpp PORTVERSION= 1.8.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org Modified: branches/2019Q1/devel/jsoncpp/files/patch-SConstruct ============================================================================== --- branches/2019Q1/devel/jsoncpp/files/patch-SConstruct Wed Feb 27 21:41:48 2019 (r494087) +++ branches/2019Q1/devel/jsoncpp/files/patch-SConstruct Wed Feb 27 21:50:17 2019 (r494088) @@ -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 )