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++ <version> 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
This commit is contained in:
Dimitry Andric
2019-02-26 19:08:42 +00:00
parent 1e8718d4b8
commit 747850b808
2 changed files with 7 additions and 2 deletions

View File

@@ -3,7 +3,7 @@
PORTNAME= jsoncpp
PORTVERSION= 1.8.1
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org

View File

@@ -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 )