json_c, disable static library, fix install for (#7641)

dev-libs/json_c/json_c-0.15.recipe

@@ -10,7 +10,7 @@ COPYRIGHT="2009-2012, 2016-2017 Eric Haszlakiewicz
 	2008-2009 Yahoo! Inc.
 	2016 Alexandru Ardelean"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://s3.amazonaws.com/json-c_releases/releases/json-c-$portVersion.tar.gz"
 CHECKSUM_SHA256="b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6"
 SOURCE_DIR="json-c-$portVersion"
@@ -57,9 +57,12 @@ defineDebugInfoPackage json_c$secondaryArchSuffix \
 
 BUILD()
 {
-	cmake -Bbuild $cmakeDirArgs . \
+	cmake -Bbuild -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs . \
 		-DENABLE_THREADING=ON \
-		-DENABLE_RDRAND=OFF
+		-DENABLE_RDRAND=OFF \
+		-DBUILD_STATIC_LIBS=OFF
+
 	cmake --build build $jobArgs
 }
 
@@ -67,11 +70,9 @@ INSTALL()
 {
 	cmake --build build --target install
 
-	mkdir -p $(dirname $includeDir)
-	mv $prefix/include $includeDir
-
 	prepareInstalledDevelLib libjson-c
 	fixPkgconfig
+
 	packageEntries devel $developDir $libDir/cmake
 }
 

dev-libs/json_c/patches/json_c-0.15.patchset

@@ -1,4 +1,4 @@
-From d20829d750f2f6dcdab2586938e1af52f3030b21 Mon Sep 17 00:00:00 2001
+From a617ad82183769147818333d3b3bd6f8ea9c7a84 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 20 Oct 2020 18:10:27 +0200
 Subject: rusage is incomplete
@@ -24,5 +24,25 @@ index bba4622..706a6b3 100644
  
  static int parseit(int fd, int (*callback)(struct json_object *))
 -- 
-2.28.0
+2.37.3
+
+
+From c9660b93bef99d169913343abd3e308621949ab7 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 25 Dec 2022 11:46:12 +0100
+Subject: Fix install for $includeDir
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 99ab904..04482af 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -494,4 +494,4 @@ if (UNIX OR MINGW OR CYGWIN)
+     install(FILES ${PROJECT_BINARY_DIR}/json-c.pc DESTINATION "${INSTALL_PKGCONFIG_DIR}")
+ endif ()
+ 
+-install(FILES ${JSON_C_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/json-c)
++install(FILES ${JSON_C_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/json-c)
+-- 
+2.37.3