* [gentoo-commits] repo/gentoo:master commit in: dev-util/dwarves/files/, dev-util/dwarves/
@ 2019-12-16 21:03 Jason A. Donenfeld
0 siblings, 0 replies; 2+ messages in thread
From: Jason A. Donenfeld @ 2019-12-16 21:03 UTC (permalink / raw
To: gentoo-commits
commit: 4580d02134f001d96c73d15ac51f6abc4d0f50dd
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 16 20:55:20 2019 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Mon Dec 16 21:03:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4580d021
dev-util/dwarves: revbump to -r1 to use newer elfutils
Currently dwarves is holding back elfutils in the tree, due to a library
reorganization, so we patch dwarves in order to support the latest
elfutils.
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
dev-util/dwarves/dwarves-1.16-r1.ebuild | 46 +++++++++++
.../dwarves/files/dwarves-1.16-no-libebl.patch | 89 ++++++++++++++++++++++
2 files changed, 135 insertions(+)
diff --git a/dev-util/dwarves/dwarves-1.16-r1.ebuild b/dev-util/dwarves/dwarves-1.16-r1.ebuild
new file mode 100644
index 00000000000..c58ef0fd660
--- /dev/null
+++ b/dev-util/dwarves/dwarves-1.16-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+inherit multilib cmake-utils python-single-r1
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+LICENSE="GPL-2" # only
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-libs/elfutils-0.178
+ sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV//_p} == ${PV} ]]; then
+ SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
+ S=${WORKDIR}
+else
+ SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
+fi
+
+DOCS=( README README.ctracer NEWS )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.10-python-import.patch
+ "${FILESDIR}"/${PN}-1.16-no-libebl.patch
+)
+
+src_configure() {
+ local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+ cmake-utils_src_configure
+}
+
+src_test() { :; }
+
+src_install() {
+ cmake-utils_src_install
+}
diff --git a/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch b/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch
new file mode 100644
index 00000000000..78c6a4e3964
--- /dev/null
+++ b/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch
@@ -0,0 +1,89 @@
+From fb56a460e23f44a4225d4f507b9ec7cf0790c75b Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Mon, 16 Dec 2019 21:51:45 +0100
+Subject: [PATCH] cmake: libebl was merged into libdw
+
+Since elfutils 178, libebl is now part of libdw, so searching for libebl
+always fails. Simply remove it from the search.
+
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+---
+ cmake/modules/FindDWARF.cmake | 23 +++++++----------------
+ 1 file changed, 7 insertions(+), 16 deletions(-)
+
+diff --git a/cmake/modules/FindDWARF.cmake b/cmake/modules/FindDWARF.cmake
+index f4feec4..027d06e 100644
+--- a/cmake/modules/FindDWARF.cmake
++++ b/cmake/modules/FindDWARF.cmake
+@@ -37,14 +37,9 @@ find_library(ELF_LIBRARY
+ PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
+ )
+
+-find_library(EBL_LIBRARY
+- NAMES ebl
+- PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
+-)
+-
+-if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
++if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
+ set(DWARF_FOUND TRUE)
+- set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY} ${EBL_LIBRARY})
++ set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY})
+
+ set(CMAKE_REQUIRED_LIBRARIES ${DWARF_LIBRARIES})
+ # check if libdw have the dwfl_module_build_id routine, i.e. if it supports the buildid
+@@ -52,10 +47,10 @@ if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AN
+ # in distributions such as fedora). We do it against libelf because, IIRC, some distros
+ # include libdw linked statically into libelf.
+ check_library_exists(elf dwfl_module_build_id "" HAVE_DWFL_MODULE_BUILD_ID)
+-else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
++else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
+ set(DWARF_FOUND FALSE)
+ set(DWARF_LIBRARIES)
+-endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
++endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
+
+ if (DWARF_FOUND)
+ if (NOT DWARF_FIND_QUIETLY)
+@@ -63,7 +58,6 @@ if (DWARF_FOUND)
+ message(STATUS "Found elfutils/libdw.h header: ${LIBDW_INCLUDE_DIR}")
+ message(STATUS "Found libdw library: ${DWARF_LIBRARY}")
+ message(STATUS "Found libelf library: ${ELF_LIBRARY}")
+- message(STATUS "Found libebl library: ${EBL_LIBRARY}")
+ endif (NOT DWARF_FIND_QUIETLY)
+ else (DWARF_FOUND)
+ if (DWARF_FIND_REQUIRED)
+@@ -73,9 +67,9 @@ else (DWARF_FOUND)
+ find_path(FEDORA fedora-release /etc)
+ find_path(REDHAT redhat-release /etc)
+ if (FEDORA OR REDHAT)
+- if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
++ if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
+ message(STATUS "Please install the elfutils-devel package")
+- endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
++ endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
+ if (NOT DWARF_LIBRARY)
+ message(STATUS "Please install the elfutils-libs package")
+ endif (NOT DWARF_LIBRARY)
+@@ -89,9 +83,6 @@ else (DWARF_FOUND)
+ if (NOT LIBDW_INCLUDE_DIR)
+ message(STATUS "Could NOT find libdw include dir")
+ endif (NOT LIBDW_INCLUDE_DIR)
+- if (NOT EBL_LIBRARY)
+- message(STATUS "Could NOT find libebl library")
+- endif (NOT EBL_LIBRARY)
+ if (NOT DWARF_LIBRARY)
+ message(STATUS "Could NOT find libdw library")
+ endif (NOT DWARF_LIBRARY)
+@@ -103,7 +94,7 @@ else (DWARF_FOUND)
+ endif (DWARF_FIND_REQUIRED)
+ endif (DWARF_FOUND)
+
+-mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY EBL_LIBRARY)
++mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY)
+ include_directories(${DWARF_INCLUDE_DIR} ${LIBDW_INCLUDE_DIR})
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
+
+--
+2.24.1
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/dwarves/files/, dev-util/dwarves/
@ 2020-08-02 14:16 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2020-08-02 14:16 UTC (permalink / raw
To: gentoo-commits
commit: dc4c466a9518fd00e1de852b8cd84552207f897b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 2 14:15:32 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 2 14:16:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc4c466a
dev-util/dwarves: Remove old (py2.7)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/dwarves/Manifest | 4 -
dev-util/dwarves/dwarves-1.12.ebuild | 45 -----------
dev-util/dwarves/dwarves-1.13.ebuild | 45 -----------
dev-util/dwarves/dwarves-1.15.ebuild | 43 -----------
dev-util/dwarves/dwarves-1.16-r1.ebuild | 46 -----------
dev-util/dwarves/dwarves-1.16.ebuild | 43 -----------
.../dwarves/files/dwarves-1.16-no-libebl.patch | 89 ----------------------
7 files changed, 315 deletions(-)
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index a94d3df0e25..d9e36684235 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -1,5 +1 @@
-DIST dwarves-1.12.tar.bz2 112400 BLAKE2B e71051041dfdbefc603dc041303de82e2e44c8b0f4f888577722466aaf7958cab7b04c15154faa8cbfcaa44fe60fc549e09b2fb68747cc3cdd08b8bce487cfdf SHA512 20644344e694253b79ede65e489696a319f10eaf424af81882414ae6efeaf34a82132321430d647916b78f97ef504907b3bd32919420f2cd14384910e283ff27
-DIST dwarves-1.13.tar.xz 222008 BLAKE2B db73f5c9a319a1a57ef37127350a9da117e3f5c89e199445393e3e312139ce8f88f46e6e5bbf302d708c0b075b1c2b2cd75dc7bc213ed144d1db792c55358220 SHA512 26485b183b4c7b608dd0392f9155dd570a14c86fdeafee232e44ad30f14a1357b408b61b0e8a31ea4bf976ed7fc44e7d5a4a3ccede9713c47265ad52c13dadf0
-DIST dwarves-1.15.tar.xz 222272 BLAKE2B a33d128ec899da0f0a1e2fc96703f0425fd1a2082675ddf886df55507b29b5fbad1a1cefd6b0a9002f50193b4c70f87a2eeacd50d94388776bb338fe678849e0 SHA512 29a8a15b7190480e79c2f423c7104d0fd275cd4c3df17518a1dd3c63cce1c528fad4b6f580baa397d9aa9323703009009e2d529939b12dd1af2c65cf7120b237
-DIST dwarves-1.16.tar.xz 273060 BLAKE2B a4cd976ff1cf6af0e2848a337400f4b1961ec5aff528d1c5893053967c0d1e7fc77de8220ae67c4b8a3eb387b659fbfd72113b29b2bf6a20d1fc45a59008a3e0 SHA512 6d57b26db70736353d8797d1f7d68c7c73b6df3ae69eb66dd7cb07d6b50a26c4f2adaa576a8915a4a7f8c41b67dcebbfc8cbdf3ba507dbf941f63941b13d65b1
DIST dwarves-1.17.tar.xz 309028 BLAKE2B 600d095359fa1ef208cc83655761505a07512faf9957144cc5fdd9e69bef98be3afc8b29a4c13aa0246aa43fdc9b4906de95f37c86fc6790ece52a79e3b13695 SHA512 8916ea24316efe1eb322d045fb2d81c230905f2fe33942eac641e9e0311f33a3bcf55be454eac32781799c255303bafacd8f1bd1b3ec08f0dae4d5f38d8186ba
diff --git a/dev-util/dwarves/dwarves-1.12.ebuild b/dev-util/dwarves/dwarves-1.12.ebuild
deleted file mode 100644
index bcd44c849ea..00000000000
--- a/dev-util/dwarves/dwarves-1.12.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/elfutils-0.131
- <=dev-libs/elfutils-0.177
- sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
- SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.bz2"
- S=${WORKDIR}
-else
- SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
- local mycmakeargs=( "-D__LIB=$(get_libdir)" )
- cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
- cmake-utils_src_install
- python_fix_shebang "${D}"/usr/bin/ostra-cg \
- "${D}"/usr/share/dwarves/runtime/python/ostra.py
-}
diff --git a/dev-util/dwarves/dwarves-1.13.ebuild b/dev-util/dwarves/dwarves-1.13.ebuild
deleted file mode 100644
index cb99e78f1ff..00000000000
--- a/dev-util/dwarves/dwarves-1.13.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/elfutils-0.131
- <=dev-libs/elfutils-0.177
- sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
- SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
- S=${WORKDIR}
-else
- SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
- local mycmakeargs=( "-D__LIB=$(get_libdir)" )
- cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
- cmake-utils_src_install
- python_fix_shebang "${D}"/usr/bin/ostra-cg \
- "${D}"/usr/share/dwarves/runtime/python/ostra.py
-}
diff --git a/dev-util/dwarves/dwarves-1.15.ebuild b/dev-util/dwarves/dwarves-1.15.ebuild
deleted file mode 100644
index d4a49fba59f..00000000000
--- a/dev-util/dwarves/dwarves-1.15.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/elfutils-0.131
- <=dev-libs/elfutils-0.177
- sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
- SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
- S=${WORKDIR}
-else
- SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
- local mycmakeargs=( "-D__LIB=$(get_libdir)" )
- cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
- cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.16-r1.ebuild b/dev-util/dwarves/dwarves-1.16-r1.ebuild
deleted file mode 100644
index c58ef0fd660..00000000000
--- a/dev-util/dwarves/dwarves-1.16-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/elfutils-0.178
- sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
- SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
- S=${WORKDIR}
-else
- SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.10-python-import.patch
- "${FILESDIR}"/${PN}-1.16-no-libebl.patch
-)
-
-src_configure() {
- local mycmakeargs=( "-D__LIB=$(get_libdir)" )
- cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
- cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.16.ebuild b/dev-util/dwarves/dwarves-1.16.ebuild
deleted file mode 100644
index d4a49fba59f..00000000000
--- a/dev-util/dwarves/dwarves-1.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/elfutils-0.131
- <=dev-libs/elfutils-0.177
- sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
- SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
- S=${WORKDIR}
-else
- SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
- local mycmakeargs=( "-D__LIB=$(get_libdir)" )
- cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
- cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch b/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch
deleted file mode 100644
index 78c6a4e3964..00000000000
--- a/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From fb56a460e23f44a4225d4f507b9ec7cf0790c75b Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Mon, 16 Dec 2019 21:51:45 +0100
-Subject: [PATCH] cmake: libebl was merged into libdw
-
-Since elfutils 178, libebl is now part of libdw, so searching for libebl
-always fails. Simply remove it from the search.
-
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- cmake/modules/FindDWARF.cmake | 23 +++++++----------------
- 1 file changed, 7 insertions(+), 16 deletions(-)
-
-diff --git a/cmake/modules/FindDWARF.cmake b/cmake/modules/FindDWARF.cmake
-index f4feec4..027d06e 100644
---- a/cmake/modules/FindDWARF.cmake
-+++ b/cmake/modules/FindDWARF.cmake
-@@ -37,14 +37,9 @@ find_library(ELF_LIBRARY
- PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
- )
-
--find_library(EBL_LIBRARY
-- NAMES ebl
-- PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
--)
--
--if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
-+if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
- set(DWARF_FOUND TRUE)
-- set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY} ${EBL_LIBRARY})
-+ set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY})
-
- set(CMAKE_REQUIRED_LIBRARIES ${DWARF_LIBRARIES})
- # check if libdw have the dwfl_module_build_id routine, i.e. if it supports the buildid
-@@ -52,10 +47,10 @@ if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AN
- # in distributions such as fedora). We do it against libelf because, IIRC, some distros
- # include libdw linked statically into libelf.
- check_library_exists(elf dwfl_module_build_id "" HAVE_DWFL_MODULE_BUILD_ID)
--else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
-+else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
- set(DWARF_FOUND FALSE)
- set(DWARF_LIBRARIES)
--endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
-+endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
-
- if (DWARF_FOUND)
- if (NOT DWARF_FIND_QUIETLY)
-@@ -63,7 +58,6 @@ if (DWARF_FOUND)
- message(STATUS "Found elfutils/libdw.h header: ${LIBDW_INCLUDE_DIR}")
- message(STATUS "Found libdw library: ${DWARF_LIBRARY}")
- message(STATUS "Found libelf library: ${ELF_LIBRARY}")
-- message(STATUS "Found libebl library: ${EBL_LIBRARY}")
- endif (NOT DWARF_FIND_QUIETLY)
- else (DWARF_FOUND)
- if (DWARF_FIND_REQUIRED)
-@@ -73,9 +67,9 @@ else (DWARF_FOUND)
- find_path(FEDORA fedora-release /etc)
- find_path(REDHAT redhat-release /etc)
- if (FEDORA OR REDHAT)
-- if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
-+ if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
- message(STATUS "Please install the elfutils-devel package")
-- endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
-+ endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
- if (NOT DWARF_LIBRARY)
- message(STATUS "Please install the elfutils-libs package")
- endif (NOT DWARF_LIBRARY)
-@@ -89,9 +83,6 @@ else (DWARF_FOUND)
- if (NOT LIBDW_INCLUDE_DIR)
- message(STATUS "Could NOT find libdw include dir")
- endif (NOT LIBDW_INCLUDE_DIR)
-- if (NOT EBL_LIBRARY)
-- message(STATUS "Could NOT find libebl library")
-- endif (NOT EBL_LIBRARY)
- if (NOT DWARF_LIBRARY)
- message(STATUS "Could NOT find libdw library")
- endif (NOT DWARF_LIBRARY)
-@@ -103,7 +94,7 @@ else (DWARF_FOUND)
- endif (DWARF_FIND_REQUIRED)
- endif (DWARF_FOUND)
-
--mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY EBL_LIBRARY)
-+mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY)
- include_directories(${DWARF_INCLUDE_DIR} ${LIBDW_INCLUDE_DIR})
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
-
---
-2.24.1
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-02 14:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-16 21:03 [gentoo-commits] repo/gentoo:master commit in: dev-util/dwarves/files/, dev-util/dwarves/ Jason A. Donenfeld
-- strict thread matches above, loose matches on Subject: below --
2020-08-02 14:16 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox