commit: be2b86d3da4f4b11556142bda524e57e8436df32
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 20 06:01:56 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Aug 20 06:02:28 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be2b86d3
dev-libs/dynolog: unbundle json
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
...r5.ebuild => dynolog-0.3.1_p20230126-r6.ebuild} | 15 +++++++-----
.../files/dynolog-0.3.1_p20230126-cmake.patch | 16 -------------
.../files/dynolog-0.3.1_p20230126-noWerror.patch | 11 ---------
.../files/dynolog-0.3.1_p20230126-nojson.patch | 28 ++++++++++++++++++++++
4 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r5.ebuild
b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r6.ebuild
similarity index 95%
rename from dev-libs/dynolog/dynolog-0.3.1_p20230126-r5.ebuild
rename to dev-libs/dynolog/dynolog-0.3.1_p20230126-r6.ebuild
index 052d00bdd88c..29291a7504f0 100644
--- a/dev-libs/dynolog/dynolog-0.3.1_p20230126-r5.ebuild
+++ b/dev-libs/dynolog/dynolog-0.3.1_p20230126-r6.ebuild
@@ -58,6 +58,7 @@ RESTRICT="!test? ( test )"
DEPEND="dev-cpp/gflags
dev-cpp/gtest
dev-cpp/glog:=
+ dev-cpp/nlohmann_json:=
dev-libs/libfmt:=
dev-libs/pfs
net-misc/curl"
@@ -74,13 +75,19 @@ PATCHES=(
"${FILESDIR}"/${P}-musl.patch
"${FILESDIR}"/${P}-libcxx.patch
"${FILESDIR}"/${P}-gcc15.patch
- "${FILESDIR}"/${P}-cmake.patch
"${FILESDIR}"/${P}-nofmt.patch
+ "${FILESDIR}"/${P}-nojson.patch
)
CMAKE_SKIP_TESTS=( "Defs.CpuSet" "KernelCollecterTest.NetworkStatsTest" )
src_prepare() {
+ rm -r third_party/fmt || die
+ rm -r third_party/gflags || die
+ rm -r third_party/glog || die
+ rm -r third_party/googletest || die
+ rm -r third_party/json || die
+ rm -r third_party/pfs || die
sed -i \
-e "s:__u64:ino_t:g" \
hbt/src/common/System.h \
@@ -89,12 +96,8 @@ src_prepare() {
cmake_comment_add_subdirectory third_party/fmt
cmake_comment_add_subdirectory third_party/gflags
cmake_comment_add_subdirectory third_party/glog
+ cmake_comment_add_subdirectory third_party/json
cmake_comment_add_subdirectory third_party/pfs
- rm -r third_party/fmt || die
- rm -r third_party/gflags || die
- rm -r third_party/glog || die
- rm -r third_party/googletest || die
- rm -r third_party/pfs || die
}
src_configure() {
diff --git a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-cmake.patch
b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-cmake.patch
deleted file mode 100644
index 0f45910beb85..000000000000
--- a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-cmake.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/third_party/json/CMakeLists.txt 2025-06-23 08:15:16.297758593 +0200
-+++ b/third_party/json/CMakeLists.txt 2025-06-23 08:16:20.637068010 +0200
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.1)
-+cmake_minimum_required(VERSION 3.10)
-
- ##
- ## PROJECT
---- a/third_party/fmt/CMakeLists.txt 2025-06-23 08:25:58.210821376 +0200
-+++ b/third_party/fmt/CMakeLists.txt 2025-06-23 08:26:09.920693727 +0200
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.1.0)
-+cmake_minimum_required(VERSION 3.10)
-
- # Use newer policies if available, up to most recent tested version of CMake.
- if(${CMAKE_VERSION} VERSION_LESS 3.11)
diff --git a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-noWerror.patch
b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-noWerror.patch
index fb915902b4cd..3d334ce96d5f 100644
--- a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-noWerror.patch
+++ b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-noWerror.patch
@@ -9,14 +9,3 @@
endif()
# SSL
---- a/third_party/pfs/CMakeLists.txt 2023-12-26 13:43:57.634865410 +0100
-+++ b/third_party/pfs/CMakeLists.txt 2023-12-26 13:44:20.865488661 +0100
-@@ -12,7 +12,7 @@
- endif ()
- message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
-
--add_compile_options (-std=c++11 -Wall -Wextra -pedantic -Werror)
-+add_compile_options (-std=c++11 -Wall -Wextra -pedantic)
-
- include_directories (include)
-
diff --git a/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-nojson.patch
b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-nojson.patch
new file mode 100644
index 000000000000..1fabcc2da947
--- /dev/null
+++ b/dev-libs/dynolog/files/dynolog-0.3.1_p20230126-nojson.patch
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt 2025-08-20 07:00:23.147426248 +0200
++++ b/CMakeLists.txt 2025-08-20 06:56:58.840619946 +0200
+@@ -59,6 +59,7 @@
+ # https://github.com/nlohmann/json#cmake
+ set(JSON_BuildTests OFF CACHE INTERNAL "")
+ add_subdirectory(third_party/json)
++find_package(nlohmann_json)
+ target_link_libraries(dynolog_lib PUBLIC nlohmann_json::nlohmann_json)
+
+ add_subdirectory(third_party/pfs)
+--- a/dynolog/src/rpc/CMakeLists.txt 2025-08-20 06:57:51.378055835 +0200
++++ b/dynolog/src/rpc/CMakeLists.txt 2025-08-20 06:58:18.054769410 +0200
+@@ -15,5 +15,6 @@
+ target_link_libraries(dynolog_rpc_lib PUBLIC gflags)
+ find_package(glog)
+ target_link_libraries(dynolog_rpc_lib PUBLIC glog::glog)
++find_package(nlohmann_json)
+ target_link_libraries(dynolog_rpc_lib PUBLIC nlohmann_json::nlohmann_json)
+ target_link_libraries(dynolog_rpc_lib PUBLIC -lfmt)
+--- a/dynolog/src/gpumon/CMakeLists.txt 2025-08-20 06:58:53.538388408
+0200
++++ b/dynolog/src/gpumon/CMakeLists.txt 2025-08-20 06:59:19.535109259
+0200
+@@ -19,5 +19,6 @@
+ target_link_libraries(dynolog_dcgm_lib PUBLIC gflags)
+ find_package(glog)
+ target_link_libraries(dynolog_dcgm_lib PUBLIC glog::glog)
++find_package(nlohmann_json)
+ target_link_libraries(dynolog_dcgm_lib PUBLIC nlohmann_json::nlohmann_json)
+ target_link_libraries(dynolog_dcgm_lib PUBLIC pfs)
