Commit 3c3bdb50 authored by Muhammad Moinur Rahman's avatar Muhammad Moinur Rahman
Browse files

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.
parent 9e3e3d7d
......@@ -3,7 +3,7 @@
PORTNAME= jsoncpp
PORTVERSION= 1.8.1
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org
......
--- SConstruct.orig 2016-05-09 23:15:49 UTC
--- SConstruct.orig 2022-01-07 23:43:40 UTC
+++ SConstruct
@@ -26,7 +26,7 @@ try:
if platform == 'linux-gcc':
......@@ -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,10 @@ 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,7 +47,11 @@
def buildJSONExample( env, target_sources, target_name ):
env = env.Clone()
@@ -187,14 +193,14 @@ def buildUnitTests( env, target_sources,
- env.Append( CPPPATH = ['#'] )
exe = env.Program( target=target_name,
source=target_sources )
env['SRCDIST_ADD']( source=[target_sources] )
@@ -187,14 +192,14 @@ def buildUnitTests( env, target_sources, target_name )
env.AlwaysBuild( check_alias_target )
def buildLibrary( env, target_sources, target_name ):
......
--- src/lib_json/json_reader.cpp.orig 2016-10-30 21:28:16 UTC
--- src/lib_json/json_reader.cpp.orig 2022-01-07 23:43:40 UTC
+++ src/lib_json/json_reader.cpp
@@ -3,6 +3,11 @@
@@ -4,6 +4,11 @@
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment