mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00
Code Issues Releases Activity

- Fix CXX not being respected. This original fix seemed to work only because

Browse Source 
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.
This commit is contained in:
Bryan Drewery 2014-08-22 19:33:20 +00:00
parent 196b09f6aa
commit e8758b4efe
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=365690
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/jsoncpp/Makefile
View File

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

12
devel/jsoncpp/files/patch-SConstruct
View File

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