From 44a20fc3bce2f11536ea8a787354d6e332120d87 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Fri, 31 Jul 2015 10:21:09 +0200 Subject: [PATCH] cmake: use vendored jsoncpp. Preparation to resolve a dependency loop. --- srcpkgs/cmake/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 838c3ad9fab..1198928ded2 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,9 +1,9 @@ # Template file for 'cmake' pkgname=cmake version=3.2.3 -revision=1 +revision=2 build_style=configure -makedepends="zlib-devel bzip2-devel expat-devel libcurl-devel jsoncpp-devel ncurses-devel libarchive-devel" +makedepends="zlib-devel bzip2-devel expat-devel libcurl-devel ncurses-devel libarchive-devel" short_desc="Cross-platform, open-source build system" maintainer="Juan RP " license="LGPL-2.1, 3-clause-BSD" @@ -16,7 +16,7 @@ if [ "$CROSS_BUILD" ]; then build_style=cmake hostmakedepends="cmake gcc-fortran" configure_args=" -DCMAKE_USE_SYSTEM_BZIP2=1" - configure_args+=" -DCMAKE_USE_SYSTEM_LIBARCHIVE=1 -DCMAKE_USE_SYSTEM_JSONCPP=1" + configure_args+=" -DCMAKE_USE_SYSTEM_LIBARCHIVE=1" configure_args+=" -DCMAKE_USE_SYSTEM_CURL=1 -DCMAKE_USE_SYSTEM_ZLIB=1" configure_args+=" -DCMAKE_USE_SYSTEM_EXPAT=1 -DCMAKE_USE_SYSTEM_BZIP2=1" configure_args+=" -DCMAKE_USE_SYSTEM_LIBLZMA=1 -DCMAKE_USE_SYSTEM_LIBFORM=1" @@ -26,7 +26,7 @@ if [ "$CROSS_BUILD" ]; then else build_style=configure configure_args="--prefix=/usr --mandir=/share/man" - configure_args+=" --docdir=/share/doc/cmake --system-libs ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}" + configure_args+=" --docdir=/share/doc/cmake --system-libs --no-system-jsoncpp ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}" fi post_install() {