diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.recipe b/dev-libs/jsoncpp/jsoncpp-1.9.5.recipe similarity index 91% rename from dev-libs/jsoncpp/jsoncpp-1.9.4.recipe rename to dev-libs/jsoncpp/jsoncpp-1.9.5.recipe index c8fe2254d..a409ea94a 100644 --- a/dev-libs/jsoncpp/jsoncpp-1.9.4.recipe +++ b/dev-libs/jsoncpp/jsoncpp-1.9.5.recipe @@ -8,14 +8,13 @@ COPYRIGHT="2007-2018 Baptiste Lepilleur and The JsonCpp Authors" LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/open-source-parsers/jsoncpp/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999" +CHECKSUM_SHA256="f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2" SOURCE_FILENAME="jsoncpp-$portVersion.tar.gz" -PATCHES="jsoncpp-$portVersion.patchset" -ARCHITECTURES="all !x86_gcc2 ?x86" +ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="24" +libVersion="25" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" diff --git a/dev-libs/jsoncpp/jsoncpp24-1.9.4.recipe b/dev-libs/jsoncpp/jsoncpp24-1.9.4.recipe new file mode 100644 index 000000000..729e1f5dc --- /dev/null +++ b/dev-libs/jsoncpp/jsoncpp24-1.9.4.recipe @@ -0,0 +1,68 @@ +SUMMARY="A C++ library for interacting with JSON" +DESCRIPTION="JsonCpp is a C++ library that allows manipulating JSON values, \ +including serialization and deserialization to and from strings. It can also \ +preserve existing comment in unserialization/serialization steps, making it a \ +convenient format to store user input files." +HOMEPAGE="https://github.com/open-source-parsers/jsoncpp" +COPYRIGHT="2007-2018 Baptiste Lepilleur and The JsonCpp Authors" +LICENSE="MIT" +REVISION="1" +SOURCE_URI="https://github.com/open-source-parsers/jsoncpp/archive/$portVersion.tar.gz" +CHECKSUM_SHA256="e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999" +SOURCE_DIR="jsoncpp-$portVersion" +SOURCE_FILENAME="jsoncpp-$portVersion.tar.gz" +PATCHES="jsoncpp-$portVersion.patchset" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +libVersion="24" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + +PROVIDES=" + jsoncpp24$secondaryArchSuffix = $portVersion + lib:libjsoncpp$secondaryArchSuffix = $libVersionCompat + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:meson + cmd:ninja + cmd:pkg_config$secondaryArchSuffix + cmd:python2 + " + +BUILD() +{ + for i in shared static; do + meson --prefix="$prefix" --libdir="$libDir" --includedir="$includeDir" \ + --buildtype release \ + --default-library $i . build-$i + ninja -C build-$i $jobArgs + done +} + +INSTALL() +{ + ninja -C build-shared install + ninja -C build-static install + + prepareInstalledDevelLib libjsoncpp + fixPkgconfig + + rm -rf $developDir +} + +TEST() +{ + LIBRARY_PATH="$sourceDir/build-shared${LIBRARY_PATH:+:$LIBRARY_PATH}" \ + ninja -C build-shared test +}