public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Roman" <davidroman96@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/libdwarf/files/, dev-libs/libdwarf/
Date: Thu, 18 Apr 2024 14:41:29 +0000 (UTC)	[thread overview]
Message-ID: <1713450374.1a53de7ad879b390b29b15c76f2d31bc8a111dd2.davidroman@gentoo> (raw)
Message-ID: <20240418144129.Lkiekj5UFyDU8wdWTHdAPor5x8fniCMl1ArMufd9tws@z> (raw)

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


             reply	other threads:[~2024-04-18 14:41 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-18 16:24 David Roman [this message]
2024-04-18 14:41 ` [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/libdwarf/files/, dev-libs/libdwarf/ David Roman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1713450374.1a53de7ad879b390b29b15c76f2d31bc8a111dd2.davidroman@gentoo \
    --to=davidroman96@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox