From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B0261158043 for ; Thu, 18 Apr 2024 14:41:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE177E2A16; Thu, 18 Apr 2024 14:41:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81693E2A19 for ; Thu, 18 Apr 2024 14:41:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 73D5F34335B for ; Thu, 18 Apr 2024 14:41:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC3E8171F for ; Thu, 18 Apr 2024 14:41:29 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1713450374.1a53de7ad879b390b29b15c76f2d31bc8a111dd2.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/libdwarf/files/, dev-libs/libdwarf/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-libs/libdwarf/files/libdwarf-0.9.2-fix-include-patch.patch dev-libs/libdwarf/libdwarf-0.9.2.ebuild X-VCS-Directories: dev-libs/libdwarf/ dev-libs/libdwarf/files/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 1a53de7ad879b390b29b15c76f2d31bc8a111dd2 X-VCS-Branch: dev Date: Thu, 18 Apr 2024 14:41:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9981c4a7-1d40-4b5f-b18f-6c85bf9aebd3 X-Archives-Hash: 9739786ace3e87a168b4e19c83c53763 Message-ID: <20240418144129.Lkiekj5UFyDU8wdWTHdAPor5x8fniCMl1ArMufd9tws@z> commit: 1a53de7ad879b390b29b15c76f2d31bc8a111dd2 Author: David Roman gmail com> AuthorDate: Thu Apr 18 14:26:14 2024 +0000 Commit: David Roman gmail com> CommitDate: Thu Apr 18 14:26:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1a53de7a dev-libs/libdwarf: switch to cmake meson doesn't install cmake targets Signed-off-by: David Roman gmail.com> .../files/libdwarf-0.9.2-fix-include-patch.patch | 22 ++++++++++++++++++++++ dev-libs/libdwarf/libdwarf-0.9.2.ebuild | 22 +++++++++++++--------- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dev-libs/libdwarf/files/libdwarf-0.9.2-fix-include-patch.patch b/dev-libs/libdwarf/files/libdwarf-0.9.2-fix-include-patch.patch new file mode 100644 index 0000000000..edc75ad1f6 --- /dev/null +++ b/dev-libs/libdwarf/files/libdwarf-0.9.2-fix-include-patch.patch @@ -0,0 +1,22 @@ +diff --git a/src/lib/libdwarf/CMakeLists.txt b/src/lib/libdwarf/CMakeLists.txt +index 6cb0b24e..12fa3e40 100644 +--- a/src/lib/libdwarf/CMakeLists.txt ++++ b/src/lib/libdwarf/CMakeLists.txt +@@ -114,7 +114,7 @@ install(TARGETS dwarf + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libdwarf/" + ) + + configure_file(libdwarf.pc.cmake libdwarf.pc @ONLY) +@@ -130,7 +130,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libdwarfConfig.cmake" "${CMAKE_CURREN + install(TARGETS dwarf EXPORT libdwarfTargets + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") ++ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libdwarf") + install(EXPORT libdwarfTargets + FILE libdwarf-targets.cmake + NAMESPACE libdwarf:: diff --git a/dev-libs/libdwarf/libdwarf-0.9.2.ebuild b/dev-libs/libdwarf/libdwarf-0.9.2.ebuild index d30bcfb27a..89fcac2563 100644 --- a/dev-libs/libdwarf/libdwarf-0.9.2.ebuild +++ b/dev-libs/libdwarf/libdwarf-0.9.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit meson +inherit cmake DESCRIPTION="The DWARF Debugging Information Format" HOMEPAGE=" @@ -16,28 +16,32 @@ SRC_URI="https://www.prevanders.net/${P}.tar.xz" LICENSE="BSD GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~amd64" -IUSE="doc dwarfexample dwarfgen" +IUSE="test doc dwarfexample dwarfgen" +RESTRICT="!test? ( test )" DEPEND=" app-arch/zstd:= sys-libs/zlib:= " RDEPEND="${DEPEND}" -BDEPEND="doc? ( app-text/doxygen )" DOCS=( AUTHORS NEWS README.md ) +PATCHES=( "${FILESDIR}/${P}-fix-include-patch.patch" ) + src_configure() { - local emesonargs=( - $(meson_use dwarfgen) - $(meson_use dwarfexample) - $(meson_use doc) + local mycmakeargs=( + -DBUILD_SHARED=ON + -DBUILD_DWARFGEN=$(usex dwarfgen) + -DBUILD_DWARFEXAMPLE=$(usex dwarfexample) + -DDO_TESTING=$(usex test) ) - meson_src_configure + + cmake_src_configure } src_install(){ - meson_src_install + cmake_src_install dodoc ChangeLog* doc/*.pdf if use doc; then