From 0297666efc8e6a978a876acc1fc52a1a56e834dd Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 13 Jul 2025 00:45:40 +0200 Subject: [PATCH] cmake, drop jsoncpp dependency in favor of internal one (#12568) --- dev-build/cmake/cmake-4.0.3.recipe | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-build/cmake/cmake-4.0.3.recipe b/dev-build/cmake/cmake-4.0.3.recipe index 04cb8ef5e..a9f3f37b8 100644 --- a/dev-build/cmake/cmake-4.0.3.recipe +++ b/dev-build/cmake/cmake-4.0.3.recipe @@ -7,7 +7,7 @@ of your choice." HOMEPAGE="https://cmake.org/" COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium" LICENSE="CMake" -REVISION="1" +REVISION="2" SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz" CHECKSUM_SHA256="8d3537b7b7732660ea247398f166be892fe6131d63cc291944b45b91279f3ffb" PATCHES="cmake-$portVersion.patchset" @@ -26,17 +26,18 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix -# lib:libarchive$secondaryArchSuffix -# lib:libcppdap$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libexpat$secondaryArchSuffix - lib:libjsoncpp$secondaryArchSuffix lib:libform$secondaryArchSuffix # from ncurses. lib:libncurses$secondaryArchSuffix lib:librhash$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libuv$secondaryArchSuffix lib:libz$secondaryArchSuffix + # use the embedded copy to avoid circular deps. +# lib:libarchive$secondaryArchSuffix +# lib:libcppdap$secondaryArchSuffix +# lib:libjsoncpp$secondaryArchSuffix # Theres are never linked to the resulting "cmds:"s. See note on BUILD_REQUIRES. # lib:libbz2$secondaryArchSuffix # lib:liblzma$secondaryArchSuffix @@ -46,16 +47,17 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel -# devel:libarchive$secondaryArchSuffix # use the embedded copy to avoid circular deps. -# devel:libcppdap$secondaryArchSuffix # use the embedded copy to avoid circular deps. devel:libcurl$secondaryArchSuffix devel:libexpat$secondaryArchSuffix - devel:libjsoncpp$secondaryArchSuffix >= 25 devel:libncurses$secondaryArchSuffix devel:librhash$secondaryArchSuffix devel:libuv$secondaryArchSuffix devel:libz$secondaryArchSuffix # devel:nlohmann_json + # use the embedded copy to avoid circular deps. +# devel:libarchive$secondaryArchSuffix +# devel:libcppdap$secondaryArchSuffix +# devel:libjsoncpp$secondaryArchSuffix >= 25 # The following do not appear to be used, nor with --system-libs, nor by enabling them # individually. Leaving them here just because they are mentioned in ./configure --help # and during the build process' output. @@ -95,12 +97,10 @@ BUILD() --no-system-libs \ --system-curl \ --system-expat \ - --system-jsoncpp \ --system-librhash \ --system-libuv \ --system-zlib \ --bootstrap-system-libuv \ - --bootstrap-system-jsoncpp \ --bootstrap-system-librhash \ --parallel=${jobArgs#-j} # These do not seem to be used anyway (libarchive at least links to libz/libzstd):