mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-17 01:46:58 +02:00
Merge pull request #126 from kinvolk/dongsu/sdk-dwarves
dev-util/dwarves: introduce new dev tool dwarves
This commit is contained in:
Dongsu Park
GitHub
commit
2ee2a3bfc0
@ -1,5 +1,2 @@
|
||||
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
|
||||
DIST dwarves-1.18.tar.xz 324912 BLAKE2B bdce2903608a1229e2fc7e8a01bc41249a17a1a003fc3616910959fc43b430569cd737a220edfab2473485cd2dc0519b4add0e0e3a690e51ad35c4fa082752a5 SHA512 01647607ce0f4dfceb464367f2dd8a432f33eb5d0e003b6bbb07b38bd992a2992844309b04aee2a0388658c41d8b2059d03064c6e450fe7c347c5bca445d7938
|
||||
|
||||
@ -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
|
||||
}
|
||||
@ -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
|
||||
}
|
||||
@ -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
|
||||
}
|
||||
@ -1,17 +1,17 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_6 )
|
||||
inherit multilib cmake-utils python-single-r1
|
||||
PYTHON_COMPAT=( python3_{6,7} )
|
||||
inherit multilib cmake 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"
|
||||
KEYWORDS="~amd64 ~ppc64 ~x86"
|
||||
IUSE="debug"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
@ -22,7 +22,6 @@ 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
|
||||
@ -31,16 +30,15 @@ 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
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_test() { :; }
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
cmake_src_install
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python3_6 )
|
||||
PYTHON_COMPAT=( python3_{6,7} )
|
||||
inherit multilib cmake-utils python-single-r1
|
||||
|
||||
DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
|
||||
@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
|
||||
|
||||
LICENSE="GPL-2" # only
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
KEYWORDS="amd64 ppc64 x86"
|
||||
IUSE="debug"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
|
||||
@ -1,43 +1,44 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_6 )
|
||||
inherit multilib cmake-utils python-single-r1
|
||||
PYTHON_COMPAT=( python3_{6,7} )
|
||||
inherit multilib cmake 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"
|
||||
KEYWORDS="~amd64 ~ppc64 ~x86"
|
||||
IUSE="debug"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
>=dev-libs/elfutils-0.131
|
||||
<=dev-libs/elfutils-0.177
|
||||
>=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 )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.10-python-import.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=( "-D__LIB=$(get_libdir)" )
|
||||
cmake-utils_src_configure
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_test() { :; }
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
cmake_src_install
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
|
||||
|
||||
PYTHON_COMPAT=( python3_6 )
|
||||
inherit multilib cmake-utils git-r3 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=""
|
||||
IUSE="debug"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
>=dev-libs/elfutils-0.178
|
||||
sys-libs/zlib"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
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
|
||||
}
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user