mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
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>
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake toolchain-funcs
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="Header-only library for parsing TOML"
|
||||
HOMEPAGE="https://github.com/skystrife/cpptoml"
|
||||
@@ -16,6 +16,7 @@ IUSE="examples"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-limits.patch"
|
||||
"${FILESDIR}/${P}-remove-libcxx-config.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
@@ -23,9 +24,5 @@ src_configure() {
|
||||
-DCPPTOML_BUILD_EXAMPLES=$(usex examples)
|
||||
)
|
||||
|
||||
if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
|
||||
mycmakeargs+=(-DENABLE_LIBCXX=ON)
|
||||
fi
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user