diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2014-08-23 03:33:20 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2014-08-23 03:33:20 +0800 |
| commit | 5d39a5ac7015007919cad62a15b11044f2558486 (patch) | |
| tree | a596452c1bdcfe162970e425e213388d118e9482 | |
| parent | 5ee694ba04682fb0c9482c35e1dc503753a3d05f (diff) | |
| download | freebsd-ports-gnome-5d39a5ac7015007919cad62a15b11044f2558486.tar.gz freebsd-ports-gnome-5d39a5ac7015007919cad62a15b11044f2558486.tar.zst freebsd-ports-gnome-5d39a5ac7015007919cad62a15b11044f2558486.zip | |
- 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.
| -rw-r--r-- | devel/jsoncpp/Makefile | 3 | ||||
| -rw-r--r-- | devel/jsoncpp/files/patch-SConstruct | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/devel/jsoncpp/Makefile b/devel/jsoncpp/Makefile index 6d2d59c5b5f1..130fa4666032 100644 --- a/devel/jsoncpp/Makefile +++ b/devel/jsoncpp/Makefile @@ -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/) diff --git a/devel/jsoncpp/files/patch-SConstruct b/devel/jsoncpp/files/patch-SConstruct index 4b93cd5f6bf1..c44bf944260d 100644 --- a/devel/jsoncpp/files/patch-SConstruct +++ b/devel/jsoncpp/files/patch-SConstruct @@ -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) |