diff options
Diffstat (limited to 'dev-cpp/json11/files')
3 files changed, 48 insertions, 0 deletions
diff --git a/dev-cpp/json11/files/json11-1.0.0-fix-multiarch-install.patch b/dev-cpp/json11/files/json11-1.0.0-fix-multiarch-install.patch new file mode 100644 index 000000000000..fef15e0e153a --- /dev/null +++ b/dev-cpp/json11/files/json11-1.0.0-fix-multiarch-install.patch @@ -0,0 +1,14 @@ +diff -Naur before/CMakeLists.txt after/CMakeLists.txt +--- before/CMakeLists.txt 2019-05-12 16:45:39.995871663 +0200 ++++ after/CMakeLists.txt 2019-05-12 16:44:56.154872666 +0200 +@@ -52,6 +52,7 @@ + target_link_libraries(json11_test json11) + endif() + +-install(TARGETS json11 DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}) +-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/json11.hpp" DESTINATION include/${CMAKE_LIBRARY_ARCHITECTURE}) +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/json11.pc" DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig) ++install(TARGETS json11 DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/json11.hpp" DESTINATION include) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/json11.pc" DESTINATION ++ ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/dev-cpp/json11/files/json11-1.0.0-include-cstdint.patch b/dev-cpp/json11/files/json11-1.0.0-include-cstdint.patch new file mode 100644 index 000000000000..29648cf15825 --- /dev/null +++ b/dev-cpp/json11/files/json11-1.0.0-include-cstdint.patch @@ -0,0 +1,12 @@ +diff --git a/json11.cpp b/json11.cpp +index 9647846..8266a14 100644 +--- a/json11.cpp ++++ b/json11.cpp +@@ -22,6 +22,7 @@ + #include "json11.hpp" + #include <cassert> + #include <cmath> ++#include <cstdint> + #include <cstdlib> + #include <cstdio> + #include <limits> diff --git a/dev-cpp/json11/files/json11-1.0.0-json11.pc-do-not-state-the-defaults.patch b/dev-cpp/json11/files/json11-1.0.0-json11.pc-do-not-state-the-defaults.patch new file mode 100644 index 000000000000..76b1591d1150 --- /dev/null +++ b/dev-cpp/json11/files/json11-1.0.0-json11.pc-do-not-state-the-defaults.patch @@ -0,0 +1,22 @@ +From d98236beaf015f2693589fca1904fb0dd01b2e6d Mon Sep 17 00:00:00 2001 +From: Florian Schmaus <flo@geekplace.eu> +Date: Wed, 1 Mar 2023 10:16:49 +0100 +Subject: [PATCH] json11.pc: do not state the defaults + +This appearantly breaks multi-arch installations. See +https://bugs.gentoo.org/863098 + +Suggested-by: Thomas Scheider <qsx@chaotikum.eu> +Signed-off-by: Florian Schmaus <flow@gentoo.org> +--- a/json11.pc.in ++++ b/json11.pc.in +@@ -5,5 +5,4 @@ includedir=${prefix}/include/@CMAKE_LIBRARY_ARCHITECTURE@ + Name: @PROJECT_NAME@ + Description: json11 is a tiny JSON library for C++11, providing JSON parsing and serialization. + Version: @PROJECT_VERSION@ +-Libs: -L${libdir} -ljson11 +-Cflags: -I${includedir} ++Libs: -ljson11 +-- +2.39.2 + |