svn commit: r494088 - in branches/2019Q1/devel/jsoncpp: . files

[Dimitry Andric]

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++ <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:	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 at 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 )