Attachment 191258 Details for Bug 226401 – scons->cmake patch for head/devel/jsoncpp/Makefile 462353 2018-02-19 22:25:14Z yuri

[patch] scons->cmake patch for head/devel/jsoncpp/Makefile 462353 2018-02-19 22:25:14Z yuri

patch-devel-jsoncpp (text/plain), 1.42 KB, created by Dan Lukes on 2018-03-06 19:58:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Lukes

Created: 2018-03-06 19:58:52 UTC

Size: 1.42 KB

patch

obsolete

>--- devel/jsoncpp/Makefile.orig	2018-03-06 20:18:42.297337000 +0100
>+++ devel/jsoncpp/Makefile	2018-03-06 20:09:02.377984000 +0100
>@@ -15,11 +15,9 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	open-source-parsers
> 
>-USES=		compiler:c++11-lang dos2unix scons
>-USE_LDCONFIG=	yes
>+USES=		compiler:c++11-lang dos2unix cmake:noninja
> 
>-PLATFORM=	linux-gcc-FreeBSD
>-MAKE_ARGS=	platform=${PLATFORM}
>+CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON
> 
> .include <bsd.port.pre.mk>
> 
>@@ -39,9 +37,9 @@
> do-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
> 	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
>-	${INSTALL_DATA} ${WRKSRC}/libs/${PLATFORM}/libjsoncpp.a \
>+	${INSTALL_DATA} ${WRKSRC}/src/lib_json/libjsoncpp.a \
> 		${STAGEDIR}${PREFIX}/lib
>-	${INSTALL_LIB} ${WRKSRC}/libs/${PLATFORM}/libjsoncpp.so.${DISTVERSION} \
>+	${INSTALL_LIB} ${WRKSRC}/src/lib_json/libjsoncpp.so.${DISTVERSION} \
> 		${STAGEDIR}${PREFIX}/lib
> 	${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.1
> 	${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so
>@@ -53,7 +51,6 @@
> 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc
> 
> do-test:
>-	@${ECHO} "Please note that 3 testcases are known to fail: https://github.com/open-source-parsers/jsoncpp/issues/628"
>-	@cd ${WRKSRC} && CXX=${CXX} ${SCONS} platform=${PLATFORM} check
>+	${WRKSRC}/src/test_lib_json/jsoncpp_test --test-auto
> 
> .include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 226401: 191258 | 191711 | 196322 | 207161