From 92304c1b9a88d3722e19d08c893be604665bf4fd Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 11 Jan 2019 14:19:58 +0100 Subject: dev-util/systemtap: Fixed shebang of /usr/bin/dtrace Closes: https://bugs.gentoo.org/675178 Package-Manager: Portage-2.3.55, Repoman-2.3.12 Signed-off-by: Lars Wendler --- dev-util/systemtap/systemtap-4.0-r1.ebuild | 105 +++++++++++++++++++++++++++++ dev-util/systemtap/systemtap-4.0.ebuild | 104 ---------------------------- 2 files changed, 105 insertions(+), 104 deletions(-) create mode 100644 dev-util/systemtap/systemtap-4.0-r1.ebuild delete mode 100644 dev-util/systemtap/systemtap-4.0.ebuild diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild new file mode 100644 index 000000000000..f3f7f9379109 --- /dev/null +++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{4,5,6,7} ) + +inherit linux-info autotools python-single-r1 user + +DESCRIPTION="A linux trace/probe tool" +HOMEPAGE="https://www.sourceware.org/systemtap/" +SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="avahi libvirt selinux sqlite +ssl" + +RDEPEND=">=dev-libs/elfutils-0.142 + dev-libs/json-c:= + sys-libs/ncurses:0= + sys-libs/readline:0= + ${PYTHON_DEPS} + avahi? ( net-dns/avahi ) + libvirt? ( >=app-emulation/libvirt-1.0.2 ) + selinux? ( sys-libs/libselinux ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( + dev-libs/nspr + dev-libs/nss + ) +" +DEPEND="${RDEPEND} + app-text/xmlto + >=sys-devel/gettext-0.18.2 + libvirt? ( dev-libs/libxml2 ) +" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS" +ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'." +ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'." +ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'." + +DOCS="AUTHORS HACKING NEWS README" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1-ia64.patch +) + +pkg_setup() { + enewgroup stapusr 156 + enewgroup stapsys 157 + enewgroup stapdev 158 + + linux-info_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + python_fix_shebang . + + sed -i \ + -e 's:-Werror::g' \ + configure.ac \ + Makefile.am \ + stapbpf/Makefile.am \ + stapdyn/Makefile.am \ + staprun/Makefile.am \ + testsuite/systemtap.unprivileged/unprivileged_probes.exp \ + testsuite/systemtap.unprivileged/unprivileged_myproc.exp \ + testsuite/systemtap.base/stmt_rel_user.exp \ + testsuite/systemtap.base/sdt_va_args.exp \ + testsuite/systemtap.base/sdt_misc.exp \ + testsuite/systemtap.base/sdt.exp \ + scripts/kprobes_test/gen_code.py \ + || die "Failed to clean up sources" + + default + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-docs + --disable-grapher + --disable-refdocs + --disable-server + --enable-pie + --with-python3 + --without-java + --without-openssl + --without-python2-probes + --without-rpm + $(use_enable libvirt virt) + $(use_enable sqlite) + $(use_with avahi) + $(use_with ssl nss) + $(use_with selinux) + ) + PYTHON3="${PYTHON}" \ + econf "${myeconfargs[@]}" +} diff --git a/dev-util/systemtap/systemtap-4.0.ebuild b/dev-util/systemtap/systemtap-4.0.ebuild deleted file mode 100644 index 4f0c2ac0dd91..000000000000 --- a/dev-util/systemtap/systemtap-4.0.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{4,5,6,7} ) - -inherit linux-info autotools python-single-r1 user - -DESCRIPTION="A linux trace/probe tool" -HOMEPAGE="https://www.sourceware.org/systemtap/" -SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="avahi libvirt selinux sqlite +ssl" - -RDEPEND=">=dev-libs/elfutils-0.142 - dev-libs/json-c:= - sys-libs/ncurses:0= - sys-libs/readline:0= - ${PYTHON_DEPS} - avahi? ( net-dns/avahi ) - libvirt? ( >=app-emulation/libvirt-1.0.2 ) - selinux? ( sys-libs/libselinux ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( - dev-libs/nspr - dev-libs/nss - ) -" -DEPEND="${RDEPEND} - app-text/xmlto - >=sys-devel/gettext-0.18.2 - libvirt? ( dev-libs/libxml2 ) -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS" -ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'." -ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'." -ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'." - -DOCS="AUTHORS HACKING NEWS README" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1-ia64.patch -) - -pkg_setup() { - enewgroup stapusr 156 - enewgroup stapsys 157 - enewgroup stapdev 158 - - linux-info_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - python_fix_shebang . - - sed -i \ - -e 's:-Werror::g' \ - configure.ac \ - Makefile.am \ - stapbpf/Makefile.am \ - stapdyn/Makefile.am \ - staprun/Makefile.am \ - testsuite/systemtap.unprivileged/unprivileged_probes.exp \ - testsuite/systemtap.unprivileged/unprivileged_myproc.exp \ - testsuite/systemtap.base/stmt_rel_user.exp \ - testsuite/systemtap.base/sdt_va_args.exp \ - testsuite/systemtap.base/sdt_misc.exp \ - testsuite/systemtap.base/sdt.exp \ - scripts/kprobes_test/gen_code.py \ - || die "Failed to clean up sources" - - default - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-docs - --disable-grapher - --disable-refdocs - --disable-server - --enable-pie - --with-python3 - --without-java - --without-openssl - --without-python2-probes - --without-rpm - $(use_enable libvirt virt) - $(use_enable sqlite) - $(use_with avahi) - $(use_with ssl nss) - $(use_with selinux) - ) - econf "${myeconfargs[@]}" -} -- cgit v1.2.3-65-gdbad