commit: 1a53de7ad879b390b29b15c76f2d31bc8a111dd2 Author: David Roman <davidroman96 <AT> gmail <DOT> com> AuthorDate: Thu Apr 18 14:26:14 2024 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> 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 <davidroman96 <AT> 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