diff options
| author | sin-ack <sin-ack@protonmail.com> | 2024-11-23 19:46:57 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-11-23 20:16:55 +0000 |
| commit | 97f9eb588373dee70da14e61648dfd3f7866184e (patch) | |
| tree | 291ec5e8e10526156f218345f0c8a4b2b17afd35 /dev-cpp/cpptoml/files/cpptoml-0.1.1-remove-libcxx-config.patch | |
| parent | b98203abbafd5f1b4155b9b6a268276e3538e476 (diff) | |
| download | gentoo-97f9eb588373dee70da14e61648dfd3f7866184e.tar.gz gentoo-97f9eb588373dee70da14e61648dfd3f7866184e.tar.bz2 gentoo-97f9eb588373dee70da14e61648dfd3f7866184e.zip | |
dev-cpp/cpptoml: fix build on system-libcxx systems
I tried to find information about find_package(LIBCXX) but I couldn't
find anything, and testing in a system-libcxx system shows it to work
without this, so just remove any configuration related to it. Tested
with USE=examples and by building dev-util/watchman which has this
as a dependency.
Closes: https://bugs.gentoo.org/944516
Signed-off-by: sin-ack <sin-ack@protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39434
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-cpp/cpptoml/files/cpptoml-0.1.1-remove-libcxx-config.patch')
| -rw-r--r-- | dev-cpp/cpptoml/files/cpptoml-0.1.1-remove-libcxx-config.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/dev-cpp/cpptoml/files/cpptoml-0.1.1-remove-libcxx-config.patch b/dev-cpp/cpptoml/files/cpptoml-0.1.1-remove-libcxx-config.patch new file mode 100644 index 000000000000..a25f004d83e5 --- /dev/null +++ b/dev-cpp/cpptoml/files/cpptoml-0.1.1-remove-libcxx-config.patch @@ -0,0 +1,37 @@ +From bfb98b0f1e0ffdc187e87c79e1c3114eadc3fa0e Mon Sep 17 00:00:00 2001 +From: sin-ack <sin-ack@protonmail.com> +Date: Sat, 23 Nov 2024 20:28:52 +0100 +Subject: [PATCH] Remove custom configuration for libc++ + +This doesn't seem to be necessary anymore for libc++ support, and +actually breaks builds on system-libcxx systems. +--- + CMakeLists.txt | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4ec25cc..6f4753b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,6 @@ include(CMakePushCheckState) + + cmake_push_check_state() + +-option(ENABLE_LIBCXX "Use libc++ for the C++ standard library" ON) + option(CPPTOML_BUILD_EXAMPLES "Build examples" ON) + + set(CMAKE_EXPORT_COMPILE_COMMANDS 1) +@@ -25,11 +24,6 @@ if(UNIX OR MINGW) + if(CMAKE_GENERATOR STREQUAL "Ninja") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics") + endif() +- +- if(ENABLE_LIBCXX) +- find_package(LIBCXX REQUIRED) +- set_libcxx_required_flags() +- endif() + endif() + endif() + +-- +2.45.2 |