diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.0.recipe b/dev-libs/jsoncpp/jsoncpp-1.8.3.recipe similarity index 79% rename from dev-libs/jsoncpp/jsoncpp-1.8.0.recipe rename to dev-libs/jsoncpp/jsoncpp-1.8.3.recipe index 29962d90e..d8804ed39 100644 --- a/dev-libs/jsoncpp/jsoncpp-1.8.0.recipe +++ b/dev-libs/jsoncpp/jsoncpp-1.8.3.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2007-2010 Baptiste Lepilleur" LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/open-source-parsers/jsoncpp/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="5deb2462cbf0c0121c9d6c9823ec72fe71417e34242e3509bc7c003d526465bc" +CHECKSUM_SHA256="3671ba6051e0f30849942cc66d1798fdf0362d089343a83f704c09ee7156604f" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" @@ -24,6 +24,7 @@ REQUIRES=" PROVIDES_devel=" jsoncpp${secondaryArchSuffix}_devel = $portVersion devel:libjsoncpp$secondaryArchSuffix = $portVersion + devel:libjsoncpp_static$secondaryArchSuffix = $portVersion " REQUIRES_devel=" jsoncpp$secondaryArchSuffix == $portVersion base @@ -45,7 +46,7 @@ BUILD() { mkdir -p build && cd build - cmake -DCMAKE_INSTALL_PREFIX=$prefix \ + cmake $cmakeDirArgs \ -DCMAKE_BUILD_TYPE='Release' \ -DBUILD_SHARED_LIBS:BOOL=ON \ .. @@ -57,16 +58,8 @@ INSTALL() cd build make install - mkdir -p $includeDir - mv $prefix/include/* $includeDir/ - rm -rf $prefix/include - - mkdir -p $developLibDir/pkgconfig - mv $libDir/pkgconfig/*.pc $developLibDir/pkgconfig/ - rm -rf $libDir/pkgconfig - + prepareInstalledDevelLib libjsoncpp* fixPkgconfig - prepareInstalledDevelLib libjsoncpp # devel package packageEntries devel \