Attachment 158056 Details for Bug 200939 – jsoncpp update patch with fix

[patch] jsoncpp update patch with fix

jsoncpp.diff (text/plain), 6.53 KB, created by Steve Wills on 2015-06-25 19:58:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2015-06-25 19:58:52 UTC

Size: 6.53 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 390165)
>+++ Makefile	(working copy)
>@@ -2,11 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	jsoncpp
>-DISTVERSION=	0.6.0-rc2
>-PORTREVISION=	1
>+PORTVERSION=	1.6.2
> CATEGORIES=	devel
>-MASTER_SITES=	SF/${PORTNAME}/jsoncpp/${DISTVERSION}
>-DISTNAME=	jsoncpp-src-${DISTVERSION}
>+MASTER_SITES=	GH
> 
> MAINTAINER=	johan@stromnet.se
> COMMENT=	JSON reader and writer library for C++
>@@ -13,20 +11,22 @@
> 
> LICENSE=	MIT
> 
>-USES=		dos2unix scons
>+USES=		dos2unix scons compiler:c++11-lang
> USE_LDCONFIG=	yes
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	open-source-parsers
>+
> MAKE_ARGS=	platform=linux-gcc
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
> 	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
>-	(cd ${WRKSRC}/libs/linux-gcc-FreeBSD/ &&  \
>-		${INSTALL_DATA} libjson_linux-gcc-FreeBSD_libmt.a \
>-		${STAGEDIR}${PREFIX}/lib/libjsoncpp.a)
>-	(cd ${WRKSRC}/libs/linux-gcc-FreeBSD/ && \
>-		${INSTALL_LIB} libjson_linux-gcc-FreeBSD_libmt.so \
>-		${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.0)
>-	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libjsoncpp.so.0 libjsoncpp.so )
>+	${INSTALL_DATA} ${WRKSRC}/libs/linux-gcc-FreeBSD/libjsoncpp.a \
>+		${STAGEDIR}${PREFIX}/lib
>+	${INSTALL_LIB} ${WRKSRC}/libs/linux-gcc-FreeBSD/libjsoncpp.so.${PORTVERSION} \
>+		${STAGEDIR}${PREFIX}/lib
>+	${LN} -s libjsoncpp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.1
>+	${LN} -s libjsoncpp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 390165)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (jsoncpp-src-0.6.0-rc2.tar.gz) = d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283
>-SIZE (jsoncpp-src-0.6.0-rc2.tar.gz) = 117661
>+SHA256 (open-source-parsers-jsoncpp-1.6.2_GH0.tar.gz) = c40e5a2583df633b904525305bda40b622d9971fee1ece7ce48ca723a4907d36
>+SIZE (open-source-parsers-jsoncpp-1.6.2_GH0.tar.gz) = 198824
>Index: files/patch-SConstruct
>===================================================================
>--- files/patch-SConstruct	(revision 390165)
>+++ files/patch-SConstruct	(working copy)
>@@ -1,6 +1,6 @@
>---- SConstruct.orig	2014-12-02 06:28:17.000000000 +0300
>-+++ SConstruct	2014-12-02 06:28:31.000000000 +0300
>-@@ -26,7 +26,7 @@
>+--- SConstruct.orig	2015-06-17 17:05:29 UTC
>++++ SConstruct
>+@@ -26,7 +26,7 @@ try:
>      if platform == 'linux-gcc':
>          CXX = 'g++' # not quite right, but env is not yet available.
>          import commands
>@@ -9,7 +9,7 @@
>          platform = 'linux-gcc-%s' %version
>          print "Using platform '%s'" %platform
>          LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')
>-@@ -65,7 +65,7 @@
>+@@ -65,7 +65,7 @@ def make_environ_vars():
>  	return vars
>  	
>  
>@@ -18,11 +18,50 @@
>                     toolpath = ['scons-tools'],
>                     tools=[] ) #, tools=['default'] )
>  
>-@@ -121,6 +121,7 @@
>+@@ -121,6 +121,7 @@ elif platform.startswith('linux-gcc'):
>      env.Tool( 'default' )
>-     env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" )
>+     env.Append( LIBS = ['pthread'], CCFLAGS = os.environ.get("CXXFLAGS", "-Wall"), LINKFLAGS=os.environ.get("LDFLAGS", "") )
>      env['SHARED_LIB_ENABLED'] = True
> +    env['CXX'] = os.environ['CXX']
>  else:
>      print "UNSUPPORTED PLATFORM."
>      env.Exit(1)
>+@@ -147,6 +148,11 @@
>+ env['BUILD_DIR'] = env.Dir(build_dir)
>+ env['ROOTBUILD_DIR'] = env.Dir(rootbuild_dir)
>+ env['DIST_DIR'] = DIST_DIR
>++
>++# Set SHLIBVERSION for env.InstallVersionedLib(). We use the version number
>++# without the "-rcXX" part.
>++env['SHLIBVERSION'] = JSONCPP_VERSION.partition('-')[0]
>++
>+ if 'TarGz' in env['BUILDERS']:
>+ 	class SrcDistAdder:
>+ 		def __init__( self, env ):
>+@@ -164,7 +170,7 @@
>+ env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] )
>+                       
>+ env_testing = env.Clone( )
>+-env_testing.Append( LIBS = ['json_${LIB_NAME_SUFFIX}'] )
>++env_testing.Append( LIBS = ['jsoncpp'] )
>+ 
>+ def buildJSONExample( env, target_sources, target_name ):
>+     env = env.Clone()
>+@@ -187,14 +193,14 @@
>+     env.AlwaysBuild( check_alias_target )
>+ 
>+ def buildLibrary( env, target_sources, target_name ):
>+-    static_lib = env.StaticLibrary( target=target_name + '_${LIB_NAME_SUFFIX}',
>++    static_lib = env.StaticLibrary( target=target_name,
>+                                     source=target_sources )
>+     global lib_dir
>+     env.Install( lib_dir, static_lib )
>+     if env['SHARED_LIB_ENABLED']:
>+-        shared_lib = env.SharedLibrary( target=target_name + '_${LIB_NAME_SUFFIX}',
>++        shared_lib = env.SharedLibrary( target=target_name,
>+                                         source=target_sources )
>+-        env.Install( lib_dir, shared_lib )
>++        env.InstallVersionedLib( lib_dir, shared_lib )
>+     env['SRCDIST_ADD']( source=[target_sources] )
>+ 
>+ Export( 'env env_testing buildJSONExample buildLibrary buildJSONTests buildUnitTests' )
>Index: files/patch-src_lib__json_sconscript
>===================================================================
>--- files/patch-src_lib__json_sconscript	(revision 0)
>+++ files/patch-src_lib__json_sconscript	(working copy)
>@@ -0,0 +1,8 @@
>+--- src/lib_json/sconscript.orig	2015-06-22 20:34:03 UTC
>++++ src/lib_json/sconscript
>+@@ -5,4 +5,4 @@ buildLibrary( env, Split( """
>+     json_value.cpp 
>+     json_writer.cpp
>+      """ ),
>+-    'json' )
>++    'jsoncpp' )
>
>Property changes on: files/patch-src_lib__json_sconscript
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 390165)
>+++ pkg-plist	(working copy)
>@@ -1,11 +1,14 @@
>-lib/libjsoncpp.so.0
>+lib/libjsoncpp.so.1.6.2
>+lib/libjsoncpp.so.1
> lib/libjsoncpp.so
> lib/libjsoncpp.a
>-include/jsoncpp/json/writer.h
>+include/jsoncpp/json/assertions.h
>+include/jsoncpp/json/autolink.h
>+include/jsoncpp/json/config.h
>+include/jsoncpp/json/features.h
>+include/jsoncpp/json/forwards.h
> include/jsoncpp/json/json.h
>-include/jsoncpp/json/forwards.h
>-include/jsoncpp/json/config.h
>+include/jsoncpp/json/reader.h
> include/jsoncpp/json/value.h
>-include/jsoncpp/json/reader.h
>-include/jsoncpp/json/features.h
>-include/jsoncpp/json/autolink.h
>+include/jsoncpp/json/version.h
>+include/jsoncpp/json/writer.h

Actions: View | Diff

Attachments on bug 200939: 157841 | 158056 | 158057