diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2025-09-17 21:02:31 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2025-09-25 21:50:35 +0200 |
| commit | e13676e8268af90a01655b3f778105d018ac8a44 (patch) | |
| tree | e18251e80f331b7f896738afbd14259db7a728d7 /dev-cpp/cpp-hocon/files | |
| parent | 2ccddfc03f756ab883d78f15949f282de814dbb6 (diff) | |
| download | gentoo-e13676e8268af90a01655b3f778105d018ac8a44.tar.gz gentoo-e13676e8268af90a01655b3f778105d018ac8a44.tar.bz2 gentoo-e13676e8268af90a01655b3f778105d018ac8a44.zip | |
dev-cpp/cpp-hocon: treeclean
Closes: https://bugs.gentoo.org/957225 (pkgremoved)
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-cpp/cpp-hocon/files')
| -rw-r--r-- | dev-cpp/cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch | 48 | ||||
| -rw-r--r-- | dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch | 51 |
2 files changed, 0 insertions, 99 deletions
diff --git a/dev-cpp/cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch b/dev-cpp/cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch deleted file mode 100644 index 8e0ddb924a46..000000000000 --- a/dev-cpp/cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,6 +10,8 @@ - string(TOUPPER ${PROJECT_C_NAME} PROJECT_NAME_UPPER) - string(TOLOWER ${PROJECT_C_NAME} PROJECT_NAME_LOWER) - -+include(GNUInstallDirs) -+ - # Common cmake setup - if (NOT CMAKE_BUILD_TYPE) - message(STATUS "Defaulting to a release build.") -@@ -42,7 +44,7 @@ - set(BOOST_COMPONENTS regex) - endif() - --list(APPEND BOOST_COMPONENTS thread date_time chrono system program_options) -+list(APPEND BOOST_COMPONENTS thread date_time chrono filesystem system program_options) - - # Add other dependencies - find_package(Boost 1.54 REQUIRED COMPONENTS ${BOOST_COMPONENTS}) ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -77,7 +77,10 @@ - set_target_properties(libprojectsrc PROPERTIES POSITION_INDEPENDENT_CODE true) - - add_library(lib${PROJECT_NAME} $<TARGET_OBJECTS:libprojectsrc>) --set_target_properties(lib${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") -+set_target_properties( -+ lib${PROJECT_NAME} -+ PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}" -+ OUTPUT_NAME ${PROJECT_NAME}) - target_link_libraries(lib${PROJECT_NAME} - ${LEATHERMAN_LIBRARIES} - ${Boost_LIBRARIES} -@@ -88,7 +91,11 @@ - symbol_exports(lib${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h") - - # This correctly handles DLL installation on Windows. --leatherman_install(lib${PROJECT_NAME}) --install(DIRECTORY inc/hocon DESTINATION include) -+install( -+ TARGETS lib${PROJECT_NAME} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(DIRECTORY inc/hocon DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - - add_subdirectory(tests) diff --git a/dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch b/dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch deleted file mode 100644 index 0964e3e7bc7a..000000000000 --- a/dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://bugs.gentoo.org/823419 - -Wanted to make this "proper" but Catch2 lacks a pkgconfig file (or a CMake one) -and it's easier to just do this for now. - -Based on patch version of sed commands from upstream bug -(https://github.com/puppetlabs/cpp-hocon/issues/132) and -Fedora (https://src.fedoraproject.org/rpms/cpp-hocon/blob/rawhide/f/cpp-hocon.spec#_76). - -Makes tests conditional too. ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,12 +16,16 @@ if (NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) - endif() - --enable_testing() -- - # Leatherman setup --set(LEATHERMAN_COMPONENTS locale catch nowide util) -+set(LEATHERMAN_COMPONENTS locale nowide util) - find_package(Leatherman REQUIRED COMPONENTS ${LEATHERMAN_COMPONENTS}) - -+option(BUILD_TESTING "Build test suite (needs Catch)" ON) -+ -+if(BUILD_TESTING) -+ enable_testing() -+endif() -+ - ## Before we find any packages, we want to pull in the common leatherman options, as they can affect commonly-used packages. - include(options) - ## Pull in common cflags setting from leatherman. Don't override CMAKE_CXX_FLAGS at the project root to avoid impacting 3rd party code. ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -91,4 +91,6 @@ symbol_exports(lib${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h" - leatherman_install(lib${PROJECT_NAME}) - install(DIRECTORY inc/hocon DESTINATION include) - --add_subdirectory(tests) -+if (BUILD_TESTING) -+ add_subdirectory(tests) -+endif() ---- a/lib/tests/CMakeLists.txt -+++ b/lib/tests/CMakeLists.txt -@@ -1,5 +1,5 @@ - # Setup compiling the test executable. C++ compile flags are inherited from the parent directory. --include_directories(${LEATHERMAN_CATCH_INCLUDE}) -+include_directories(@GENTOO_PORTAGE_EPREFIX@/usr/include/catch) - - set(TEST_CASES - concatenation_test.cc |
