From 97f9eb588373dee70da14e61648dfd3f7866184e Mon Sep 17 00:00:00 2001
From: sin-ack <sin-ack@protonmail.com>
Date: Sat, 23 Nov 2024 19:46:57 +0000
Subject: 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>
---
 dev-cpp/cpptoml/cpptoml-0.1.1-r1.ebuild            | 28 ++++++++++++++++
 dev-cpp/cpptoml/cpptoml-0.1.1.ebuild               | 31 ------------------
 .../files/cpptoml-0.1.1-remove-libcxx-config.patch | 37 ++++++++++++++++++++++
 3 files changed, 65 insertions(+), 31 deletions(-)
 create mode 100644 dev-cpp/cpptoml/cpptoml-0.1.1-r1.ebuild
 delete mode 100644 dev-cpp/cpptoml/cpptoml-0.1.1.ebuild
 create mode 100644 dev-cpp/cpptoml/files/cpptoml-0.1.1-remove-libcxx-config.patch

(limited to 'dev-cpp/cpptoml')

diff --git a/dev-cpp/cpptoml/cpptoml-0.1.1-r1.ebuild b/dev-cpp/cpptoml/cpptoml-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..d353eccd491f
--- /dev/null
+++ b/dev-cpp/cpptoml/cpptoml-0.1.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Header-only library for parsing TOML"
+HOMEPAGE="https://github.com/skystrife/cpptoml"
+SRC_URI="https://github.com/skystrife/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="examples"
+
+PATCHES=(
+	"${FILESDIR}/${P}-limits.patch"
+	"${FILESDIR}/${P}-remove-libcxx-config.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCPPTOML_BUILD_EXAMPLES=$(usex examples)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/cpptoml/cpptoml-0.1.1.ebuild b/dev-cpp/cpptoml/cpptoml-0.1.1.ebuild
deleted file mode 100644
index e90c6978b955..000000000000
--- a/dev-cpp/cpptoml/cpptoml-0.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="Header-only library for parsing TOML"
-HOMEPAGE="https://github.com/skystrife/cpptoml"
-SRC_URI="https://github.com/skystrife/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="examples"
-
-PATCHES=(
-	"${FILESDIR}/${P}-limits.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCPPTOML_BUILD_EXAMPLES=$(usex examples)
-	)
-
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		mycmakeargs+=(-DENABLE_LIBCXX=ON)
-	fi
-
-	cmake_src_configure
-}
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
-- 
cgit v1.2.3