svn commit: r365690 - in head/devel/jsoncpp: . files

[Bryan Drewery]

Author: bdrewery
Date: Fri Aug 22 19:33:20 2014
New Revision: 365690
URL: http://svnweb.freebsd.org/changeset/ports/365690
QAT: https://qat.redports.org/buildarchive/r365690/

Log:
  - Fix CXX not being respected. This original fix seemed to work only because
    scons tries c++, then g++. If you had g++ installed then it would use that
    regardless of CXX. Just pull CXX out of the environment intead.

Modified:
  head/devel/jsoncpp/Makefile
  head/devel/jsoncpp/files/patch-SConstruct

Modified: head/devel/jsoncpp/Makefile
==============================================================================
--- head/devel/jsoncpp/Makefile	Fri Aug 22 19:16:28 2014	(r365689)
+++ head/devel/jsoncpp/Makefile	Fri Aug 22 19:33:20 2014	(r365690)
@@ -17,9 +17,6 @@ USE_LDCONFIG=	yes
 
 MAKE_ARGS=	platform=linux-gcc
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/SConstruct
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
 	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)

Modified: head/devel/jsoncpp/files/patch-SConstruct
==============================================================================
--- head/devel/jsoncpp/files/patch-SConstruct	Fri Aug 22 19:16:28 2014	(r365689)
+++ head/devel/jsoncpp/files/patch-SConstruct	Fri Aug 22 19:33:20 2014	(r365690)
@@ -1,5 +1,5 @@
---- ./SConstruct.orig	2014-01-21 02:29:19.000000000 -0200
-+++ ./SConstruct	2014-01-21 02:29:28.000000000 -0200
+--- ./SConstruct.orig	2014-08-22 14:25:14.780951671 -0500
++++ ./SConstruct	2014-08-22 14:25:37.478948513 -0500
 @@ -26,7 +26,7 @@
      if platform == 'linux-gcc':
          CXX = 'g++' # not quite right, but env is not yet available.
@@ -9,3 +9,11 @@
          platform = 'linux-gcc-%s' %version
          print "Using platform '%s'" %platform
          LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')
+@@ -121,6 +121,7 @@
+     env.Tool( 'default' )
+     env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" )
+     env['SHARED_LIB_ENABLED'] = True
++    env['CXX'] = os.environ['CXX']
+ else:
+     print "UNSUPPORTED PLATFORM."
+     env.Exit(1)