* [gentoo-commits] repo/gentoo:master commit in: dev-util/systemtap/, dev-util/systemtap/files/
@ 2017-11-07 23:08 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2017-11-07 23:08 UTC (permalink / raw
To: gentoo-commits
commit: aba6b82f56ee4e00781f4c22fcd5b6f86554215b
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 7 23:07:52 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Nov 7 23:07:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba6b82f
dev-util/systemtap: tweak operand constraints for ia64, bug #510134
Reported-by: Émeric Maschino
Closes: https://bugs.gentoo.org/510134
Package-Manager: Portage-2.3.13, Repoman-2.3.4
dev-util/systemtap/files/systemtap-3.1-ia64.patch | 23 +++++++++++++++++++++++
dev-util/systemtap/systemtap-3.1-r1.ebuild | 2 ++
2 files changed, 25 insertions(+)
diff --git a/dev-util/systemtap/files/systemtap-3.1-ia64.patch b/dev-util/systemtap/files/systemtap-3.1-ia64.patch
new file mode 100644
index 00000000000..4750207a6ff
--- /dev/null
+++ b/dev-util/systemtap/files/systemtap-3.1-ia64.patch
@@ -0,0 +1,23 @@
+Workaround build failure on ia64
+
+Avoid 'o' constraint to allow gcc to select register operand.
+That way instruction selector can satisfy all constraints
+for PROBE2 macro.
+
+Reported-by: Émeric Maschino
+Bug: https://bugs.gentoo.org/510134
+diff --git a/cache.cxx b/cache.cxx
+index 3546b30..2710abf 100644
+--- a/cache.cxx
++++ b/cache.cxx
+@@ -8,2 +8,10 @@
+
++#ifdef __ia64__
++// Default is: nor
++// We disable 'o' because gcc fails to select register
++// constraint for second instruction in 'add_script_to_cache'
++// https://bugs.gentoo.org/510134
++# define STAP_SDT_ARG_CONSTRAINT nr
++#endif
++
+ #include "config.h"
diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
index cd13a9e21c2..bfd2527d954 100644
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ b/dev-util/systemtap/systemtap-3.1-r1.ebuild
@@ -33,6 +33,8 @@ ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) -
DOCS="AUTHORS HACKING NEWS README"
+PATCHES=("${FILESDIR}"/${PN}-3.1-ia64.patch)
+
pkg_setup() {
linux-info_pkg_setup
python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/systemtap/, dev-util/systemtap/files/
@ 2020-09-08 22:58 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-09-08 22:58 UTC (permalink / raw
To: gentoo-commits
commit: 8ea5dd98f52cf8e2c02c419c91438b1fb5e6578a
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 8 22:58:23 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 22:58:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ea5dd98
dev-util/systemtap: respect user's AR
Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/720710
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/systemtap/files/systemtap-4.0-AR.patch | 11 +++++++++++
dev-util/systemtap/systemtap-4.0-r1.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/dev-util/systemtap/files/systemtap-4.0-AR.patch b/dev-util/systemtap/files/systemtap-4.0-AR.patch
new file mode 100644
index 00000000000..fa5334e6fcf
--- /dev/null
+++ b/dev-util/systemtap/files/systemtap-4.0-AR.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/720710
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,6 +22,7 @@ AC_PROG_LN_S
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_CPP
++AM_PROG_AR
+ AM_PROG_CC_C_O
+ AC_PROG_RANLIB
+ AC_OBJEXT
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index 03103d13f0f..b04e23d320d 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -48,6 +48,7 @@ DOCS="AUTHORS HACKING NEWS README"
PATCHES=(
"${FILESDIR}"/${PN}-3.1-ia64.patch
+ "${FILESDIR}"/${PN}-4.0-AR.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/systemtap/, dev-util/systemtap/files/
@ 2021-01-09 21:38 Sven Wegener
0 siblings, 0 replies; 6+ messages in thread
From: Sven Wegener @ 2021-01-09 21:38 UTC (permalink / raw
To: gentoo-commits
commit: 760ed8ddc1c6315976807a85bbb8127fe2d8dc49
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 21:32:22 2021 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 21:38:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=760ed8dd
dev-util/systemtap: Version bump to 4.4, bug #764659
Closes: https://bugs.gentoo.org/764659
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
dev-util/systemtap/Manifest | 1 +
...systemtap-4.4-configure.ac-non-posix-test.patch | 199 +++++++++++++++++++++
dev-util/systemtap/systemtap-4.4.ebuild | 116 ++++++++++++
3 files changed, 316 insertions(+)
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 64824bfcd4c..7a49d47e893 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1 +1,2 @@
DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
+DIST systemtap-4.4.tar.gz 5532282 BLAKE2B bcb2f744ad09821ce63d78b3e86eb489013aed247952c72d3dbc4cc6fc1a2b85f948b71c622487876f43b615c147eb1624b2c146e9b4176e3c91e2b7cbef9ea0 SHA512 8fb1fe5071ec99ce3c6bcf82afdc98a3e1abc0ea937f3019b225c3a1879ada30080740b1918a84c6db06fe1893e6d1e7dc84be26c7e597d7feda1efe11354e76
diff --git a/dev-util/systemtap/files/systemtap-4.4-configure.ac-non-posix-test.patch b/dev-util/systemtap/files/systemtap-4.4-configure.ac-non-posix-test.patch
new file mode 100644
index 00000000000..bd1c6037683
--- /dev/null
+++ b/dev-util/systemtap/files/systemtap-4.4-configure.ac-non-posix-test.patch
@@ -0,0 +1,199 @@
+ configure.ac | 58 +++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 29 insertions(+), 29 deletions(-)
+
+diff --git i/configure.ac w/configure.ac
+index 9589fa6f2..2d519f1ba 100644
+--- i/configure.ac
++++ w/configure.ac
+@@ -287,7 +287,7 @@ AC_ARG_ENABLE([translator],
+ AS_HELP_STRING([--disable-translator], [build only runtime utilities]),
+ [],
+ [enable_translator="yes"])
+-AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" == "yes"])
++AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" = "yes"])
+
+ dnl Handle the option to build the crash extension
+ AC_ARG_ENABLE([crash],
+@@ -328,25 +328,25 @@ AC_CHECK_PROG(have_latex, latex, yes, no)
+ AC_CHECK_PROG(have_dvips, dvips, yes, no)
+ AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no)
+ if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then
+- if test "$enable_docs" == "yes"; then
++ if test "$enable_docs" = "yes"; then
+ AC_MSG_ERROR([cannot find all tools for building documentation])
+ fi
+- if test "$enable_docs" == "check"; then
++ if test "$enable_docs" = "check"; then
+ AC_MSG_WARN([will not build documentation, cannot find all tools])
+ fi
+ fi
+-if test "$enable_docs" == "prebuilt"; then
++if test "$enable_docs" = "prebuilt"; then
+ AC_MSG_NOTICE([will only install prebuilt documentation])
+ fi
+-if test "x${have_latex}${have_dvips}${have_ps2pdf}" == "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
++if test "x${have_latex}${have_dvips}${have_ps2pdf}" = "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
+ building_docs="yes"
+ installing_prebuilt_docs="yes"
+ fi
+-if test "$enable_docs" == "no"; then
++if test "$enable_docs" = "no"; then
+ installing_prebuilt_docs="no"
+ fi
+-AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"])
+-AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" == "yes"])
++AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" = "yes"])
++AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" = "yes"])
+
+
+ dnl Handle the option to build the reference documentation
+@@ -356,17 +356,17 @@ AC_ARG_ENABLE([refdocs],
+ [enable building reference documentation (default on if other documentation built).]),
+ [enable_refdocs=$enableval],
+ [enable_refdocs="check"])
+-if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then
++if test "$building_docs" = "no" -a "$enable_refdocs" = "yes" ; then
+ AC_MSG_ERROR([must use --enable-docs with --enable-refdocs])
+ fi
+-if test "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
++if test "$enable_refdocs" != "no" -a "${building_docs}" = "yes"; then
+ building_refdocs="yes"
+ fi
+-AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"])
++AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" = "yes"])
+
+ AC_CHECK_PROG(have_xmlto, xmlto, yes, no)
+ AC_CHECK_PROG(have_fop, fop, yes, no)
+-if test "x${have_fop}" == "xyes"; then
++if test "x${have_fop}" = "xyes"; then
+ # Due to rhbz505364 / 830266, we must actually test-run fop, not just
+ # hope that it works.
+ AC_MSG_CHECKING([to see if xmlto --with-fop actually works])
+@@ -378,8 +378,8 @@ if test "x${have_fop}" == "xyes"; then
+ fi
+ rm -f dummy-tapsets.pdf
+ fi
+-AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" == "yes"])
+-AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" == "yes"])
++AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = "yes"])
++AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = "yes"])
+
+ dnl Handle the option to build the html documentation
+ building_htmldocs="no"
+@@ -388,11 +388,11 @@ AC_ARG_ENABLE([htmldocs],
+ [enable building html documentation (default off).]),
+ [building_htmldocs=$enableval],
+ [building_htmldocs="no"])
+-if test "$have_xmlto" == "no" -a "$building_htmldocs" == "yes"; then
++if test "$have_xmlto" = "no" -a "$building_htmldocs" = "yes"; then
+ AC_MSG_ERROR([xmlto required for building html documentation])
+ fi
+
+-AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" == "yes"])
++AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" = "yes"])
+
+ dnl There is a strange bug in older versions of xmlto when generating pdf.
+ dnl https://bugzilla.redhat.com/show_bug.cgi?id=526273
+@@ -412,10 +412,10 @@ cat > conftest.xml << 'EOF'
+ </book>
+ EOF
+
+-if test "x${have_xmlto}" == "xyes"; then
++if test "x${have_xmlto}" = "xyes"; then
+ AC_MSG_CHECKING([for xmlto --stringparam support])
+ xmlto --stringparam man.authors.section.enabled=0 html-nochunks conftest.xml >/dev/null 2>&1
+- if test $? == 0; then
++ if test $? = 0; then
+ have_xmlto_stringparam="yes"
+ AC_MSG_RESULT([yes])
+ else
+@@ -423,7 +423,7 @@ AC_MSG_CHECKING([for xmlto --stringparam support])
+ fi
+ rm -f conftest.html
+ fi
+-AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" == "yes"])
++AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" = "yes"])
+
+ rm -f conftest.xml
+
+@@ -489,7 +489,7 @@ dnl See if we have enough libraries and tools to build the compile server
+ AC_MSG_WARN([will not build systemtap compile server, cannot find nss headers])
+ fi
+ fi
+-AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" == "yes" -a "$enable_server" != "no"])
++AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" = "yes" -a "$enable_server" != "no"])
+
+ if test "${have_nss}" != "yes"; then
+ AC_MSG_WARN([compile-server client functionality will be disabled, cannot find nss development files])
+@@ -530,10 +530,10 @@ if test "$with_rpm" != "no"; then
+ AC_DEFINE([HAVE_LIBRPMIO],[1],[have librpmio])
+ stap_LIBS="$stap_LIBS -lc -lrpmio"
+ have_librpmio="yes"], [have_librpmio="no"])
+- if test "x$have_librpm" != "xyes" -a "$with_rpm" == "yes"; then
++ if test "x$have_librpm" != "xyes" -a "$with_rpm" = "yes"; then
+ AC_MSG_ERROR([cannot find librpm])
+ fi
+- if test "x$have_librpmio" != "xyes" -a "$with_rpm" == "yes"; then
++ if test "x$have_librpmio" != "xyes" -a "$with_rpm" = "yes"; then
+ AC_MSG_WARN([cannot find librpmio])
+ fi
+ fi
+@@ -570,7 +570,7 @@ else
+ [Define if you have the readline library (-lreadline).])
+ fi
+ AC_SUBST([READLINE_LIBS])
+-AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" == "yes"])
++AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" = "yes"])
+
+ dnl End of readline checks: restore LIBS
+ LIBS=$LIBS_no_readline
+@@ -726,7 +726,7 @@ dnl See if we have enough libraries and tools to build the virt server
+ AC_MSG_WARN([will not build systemtap virt support, cannot find xml2 headers])
+ fi
+ fi
+-AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a "${have_libxml2}" == "yes" -a "$enable_virt" != "no"])
++AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" = "yes" -a "${have_libxml2}" = "yes" -a "$enable_virt" != "no"])
+
+ dnl Handle the option to build python2 probe support
+ AC_ARG_WITH([python2-probes],
+@@ -801,11 +801,11 @@ if test "$enable_monitor" != "no"; then
+ dnl Check for presence of json-c and ncurses for use in monitor mode
+ PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
+ PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
+-if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
++if test "${have_jsonc}" = "yes" -a "${have_ncurses}" = yes; then
+ AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
+ fi
+ fi
+-AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"])
++AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" = "yes" -a "${have_ncurses}" = "yes" -a "$enable_monitor" != "no"])
+
+ AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [
+ old_CFLAGS="$CFLAGS"
+@@ -840,7 +840,7 @@ AS_IF([test "x$with_bpf" != "xno"], [
+ [],
+ [#include <linux/bpf.h>])
+ ])
+-AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" == "xyes"])
++AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" = "xyes"])
+ AC_CONFIG_FILES([includes/sys/sdt-config.h po/Makefile.in])
+
+ dnl determine whether BPF raw tracepoints are available
+@@ -931,7 +931,7 @@ AS_IF([test "x$enable_http" = "xyes"],
+ dnl If we have all of the libraries, the json-c and nss libraries,
+ dnl and full C++11 support, we could build the httpd web
+ dnl compilation service.
+- AS_IF([test "x$have_libmicrohttpd" == "xtrue" -a "x$have_libuuid" == "xtrue" -a "x$have_libcurl" == "xtrue" -a "x$have_jsonc" == "xyes" -a "x$have_nss" == "xyes" -a "x$have_openssl" == "xyes" -a "x$have_cxx0x" == "xno"], [have_http_support=yes])])
++ AS_IF([test "x$have_libmicrohttpd" = "xtrue" -a "x$have_libuuid" = "xtrue" -a "x$have_libcurl" = "xtrue" -a "x$have_jsonc" = "xyes" -a "x$have_nss" = "xyes" -a "x$have_openssl" = "xyes" -a "x$have_cxx0x" = "xno"], [have_http_support=yes])])
+
+ AS_IF([test "x$have_http_support" = "xyes"],
+ [AC_DEFINE([HAVE_HTTP_SUPPORT], [1],
+@@ -976,7 +976,7 @@ initscript/99stap/module-setup.sh \
+ initscript/99stap/install \
+ initscript/99stap/check ])
+ AC_CONFIG_SUBDIRS(testsuite)
+-if test $enable_translator == "yes"; then
++if test $enable_translator = "yes"; then
+ AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
+ fi
+ AC_CONFIG_FILES([dtrace], [chmod +x dtrace])
diff --git a/dev-util/systemtap/systemtap-4.4.ebuild b/dev-util/systemtap/systemtap-4.4.ebuild
new file mode 100644
index 00000000000..690944a69d1
--- /dev/null
+++ b/dev-util/systemtap/systemtap-4.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit linux-info autotools python-single-r1
+
+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="libvirt selinux sqlite +ssl zeroconf"
+
+RDEPEND=">=dev-libs/elfutils-0.142
+ dev-libs/json-c:=
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ ${PYTHON_DEPS}
+ libvirt? ( >=app-emulation/libvirt-1.0.2 )
+ selinux? ( sys-libs/libselinux )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? (
+ dev-libs/nspr
+ dev-libs/nss
+ )
+ zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}
+ app-arch/cpio
+ app-text/xmlto
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ >=sys-devel/gettext-0.18.2
+ libvirt? ( dev-libs/libxml2 )
+"
+RDEPEND="${RDEPEND}
+ acct-group/stapdev
+ acct-group/stapsys
+ acct-group/stapusr
+"
+
+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
+ "${FILESDIR}"/${P}-configure.ac-non-posix-test.patch
+)
+
+pkg_setup() {
+ 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 zeroconf avahi)
+ $(use_with ssl nss)
+ $(use_with selinux)
+ )
+ PYTHON3="${PYTHON}" \
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ python_optimize
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/systemtap/, dev-util/systemtap/files/
@ 2021-01-09 21:38 Sven Wegener
0 siblings, 0 replies; 6+ messages in thread
From: Sven Wegener @ 2021-01-09 21:38 UTC (permalink / raw
To: gentoo-commits
commit: d9e418897d938968c73c24deed360e04fb7342e1
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 21:30:42 2021 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 21:38:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e41889
dev-util/systemtap: Fix building with non-bash shell, bug #719438
Closes: https://bugs.gentoo.org/719438
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
...systemtap-4.0-configure.ac-non-posix-test.patch | 214 +++++++++++++++++++++
dev-util/systemtap/systemtap-4.0-r2.ebuild | 117 +++++++++++
2 files changed, 331 insertions(+)
diff --git a/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch b/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch
new file mode 100644
index 00000000000..d429ab197dd
--- /dev/null
+++ b/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch
@@ -0,0 +1,214 @@
+ configure.ac | 62 ++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 31 insertions(+), 31 deletions(-)
+
+diff --git i/configure.ac w/configure.ac
+index caa62ee28..19db3fb21 100644
+--- i/configure.ac
++++ w/configure.ac
+@@ -225,7 +225,7 @@ dnl fi
+ # Compiling without fPIE by default (see PR 9922)
+ AC_ARG_ENABLE([pie],
+ [AS_HELP_STRING([--enable-pie], [enable position-independent-executable])])
+-AS_IF([test "x$enable_pie" == xyes],[
++AS_IF([test "x$enable_pie" = xyes],[
+ PIECFLAGS='-fPIE'
+ PIECXXFLAGS='-fPIE'
+ PIELDFLAGS='-pie -Wl,-z,relro -Wl,-z,now'
+@@ -271,7 +271,7 @@ AC_ARG_ENABLE([translator],
+ AS_HELP_STRING([--disable-translator], [build only runtime utilities]),
+ [],
+ [enable_translator="yes"])
+-AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" == "yes"])
++AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" = "yes"])
+
+ dnl Handle the option to build the crash extension
+ AC_ARG_ENABLE([crash],
+@@ -312,25 +312,25 @@ AC_CHECK_PROG(have_latex, latex, yes, no)
+ AC_CHECK_PROG(have_dvips, dvips, yes, no)
+ AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no)
+ if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then
+- if test "$enable_docs" == "yes"; then
++ if test "$enable_docs" = "yes"; then
+ AC_MSG_ERROR([cannot find all tools for building documentation])
+ fi
+- if test "$enable_docs" == "check"; then
++ if test "$enable_docs" = "check"; then
+ AC_MSG_WARN([will not build documentation, cannot find all tools])
+ fi
+ fi
+-if test "$enable_docs" == "prebuilt"; then
++if test "$enable_docs" = "prebuilt"; then
+ AC_MSG_NOTICE([will only install prebuilt documentation])
+ fi
+-if test "x${have_latex}${have_dvips}${have_ps2pdf}" == "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
++if test "x${have_latex}${have_dvips}${have_ps2pdf}" = "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
+ building_docs="yes"
+ installing_prebuilt_docs="yes"
+ fi
+-if test "$enable_docs" == "no"; then
++if test "$enable_docs" = "no"; then
+ installing_prebuilt_docs="no"
+ fi
+-AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"])
+-AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" == "yes"])
++AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" = "yes"])
++AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" = "yes"])
+
+
+ dnl Handle the option to build the reference documentation
+@@ -340,17 +340,17 @@ AC_ARG_ENABLE([refdocs],
+ [enable building reference documentation (default on if other documentation built).]),
+ [enable_refdocs=$enableval],
+ [enable_refdocs="check"])
+-if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then
++if test "$building_docs" = "no" -a "$enable_refdocs" = "yes" ; then
+ AC_MSG_ERROR([must use --enable-docs with --enable-refdocs])
+ fi
+-if test "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
++if test "$enable_refdocs" != "no" -a "${building_docs}" = "yes"; then
+ building_refdocs="yes"
+ fi
+-AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"])
++AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" = "yes"])
+
+ AC_CHECK_PROG(have_xmlto, xmlto, yes, no)
+ AC_CHECK_PROG(have_fop, fop, yes, no)
+-if test "x${have_fop}" == "xyes"; then
++if test "x${have_fop}" = "xyes"; then
+ # Due to rhbz505364 / 830266, we must actually test-run fop, not just
+ # hope that it works.
+ AC_MSG_CHECKING([to see if xmlto --with-fop actually works])
+@@ -362,8 +362,8 @@ if test "x${have_fop}" == "xyes"; then
+ fi
+ rm -f dummy-tapsets.pdf
+ fi
+-AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" == "yes"])
+-AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" == "yes"])
++AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = "yes"])
++AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = "yes"])
+
+ dnl Handle the option to build the html documentation
+ building_htmldocs="no"
+@@ -372,11 +372,11 @@ AC_ARG_ENABLE([htmldocs],
+ [enable building html documentation (default off).]),
+ [building_htmldocs=$enableval],
+ [building_htmldocs="no"])
+-if test "$have_xmlto" == "no" -a "$building_htmldocs" == "yes"; then
++if test "$have_xmlto" = "no" -a "$building_htmldocs" = "yes"; then
+ AC_MSG_ERROR([xmlto required for building html documentation])
+ fi
+
+-AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" == "yes"])
++AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" = "yes"])
+
+ dnl There is a strange bug in older versions of xmlto when generating pdf.
+ dnl https://bugzilla.redhat.com/show_bug.cgi?id=526273
+@@ -396,10 +396,10 @@ cat > conftest.xml << 'EOF'
+ </book>
+ EOF
+
+-if test "x${have_xmlto}" == "xyes"; then
++if test "x${have_xmlto}" = "xyes"; then
+ AC_MSG_CHECKING([for xmlto --stringparam support])
+ xmlto --stringparam man.authors.section.enabled=0 html-nochunks conftest.xml >/dev/null 2>&1
+- if test $? == 0; then
++ if test $? = 0; then
+ have_xmlto_stringparam="yes"
+ AC_MSG_RESULT([yes])
+ else
+@@ -407,7 +407,7 @@ AC_MSG_CHECKING([for xmlto --stringparam support])
+ fi
+ rm -f conftest.html
+ fi
+-AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" == "yes"])
++AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" = "yes"])
+
+ rm -f conftest.xml
+
+@@ -473,7 +473,7 @@ dnl See if we have enough libraries and tools to build the compile server
+ AC_MSG_WARN([will not build systemtap compile server, cannot find nss headers])
+ fi
+ fi
+-AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" == "yes" -a "$enable_server" != "no"])
++AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" = "yes" -a "$enable_server" != "no"])
+
+ if test "${have_nss}" != "yes"; then
+ AC_MSG_WARN([compile-server client functionality will be disabled, cannot find nss development files])
+@@ -514,10 +514,10 @@ if test "$with_rpm" != "no"; then
+ AC_DEFINE([HAVE_LIBRPMIO],[1],[have librpmio])
+ stap_LIBS="$stap_LIBS -lc -lrpmio"
+ have_librpmio="yes"], [have_librpmio="no"])
+- if test "x$have_librpm" != "xyes" -a "$with_rpm" == "yes"; then
++ if test "x$have_librpm" != "xyes" -a "$with_rpm" = "yes"; then
+ AC_MSG_ERROR([cannot find librpm])
+ fi
+- if test "x$have_librpmio" != "xyes" -a "$with_rpm" == "yes"; then
++ if test "x$have_librpmio" != "xyes" -a "$with_rpm" = "yes"; then
+ AC_MSG_WARN([cannot find librpmio])
+ fi
+ fi
+@@ -554,7 +554,7 @@ else
+ [Define if you have the readline library (-lreadline).])
+ fi
+ AC_SUBST([READLINE_LIBS])
+-AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" == "yes"])
++AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" = "yes"])
+
+ dnl End of readline checks: restore LIBS
+ LIBS=$LIBS_no_readline
+@@ -710,7 +710,7 @@ dnl See if we have enough libraries and tools to build the virt server
+ AC_MSG_WARN([will not build systemtap virt support, cannot find xml2 headers])
+ fi
+ fi
+-AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a "${have_libxml2}" == "yes" -a "$enable_virt" != "no"])
++AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" = "yes" -a "${have_libxml2}" = "yes" -a "$enable_virt" != "no"])
+
+ dnl Handle the option to build python2 probe support
+ AC_ARG_WITH([python2-probes],
+@@ -750,7 +750,7 @@ have_python3_support=no
+ AS_IF([test "x$with_python3_probes" != "xno"],
+ [dnl First, check to make sure we have the 'python3-config' script.
+ pathless_python3=$(basename "$PYTHON3")
+- if test "x${pathless_python3}" == "x"; then
++ if test "x${pathless_python3}" = "x"; then
+ pathless_python3="python3"
+ fi
+ AC_PATH_PROG([PYTHON3_CONFIG], [${pathless_python3}-config], [no])
+@@ -785,8 +785,8 @@ AM_CONDITIONAL([HAVE_PYTHON_PROBES],
+ dnl Check for presence of json-c and ncurses for use in monitor mode
+ PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
+ PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
+-AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"])
+-if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
++AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" = "yes" -a "${have_ncurses}" = "yes"])
++if test "${have_jsonc}" = "yes" -a "${have_ncurses}" = yes; then
+ AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
+ fi
+
+@@ -823,7 +823,7 @@ AS_IF([test "x$with_bpf" != "xno"], [
+ [],
+ [#include <linux/bpf.h>])
+ ])
+-AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" == "xyes"])
++AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" = "xyes"])
+ AC_CONFIG_FILES([includes/sys/sdt-config.h po/Makefile.in])
+
+ if test $build_elfutils = yes -a $enable_translator = yes; then
+@@ -965,7 +965,7 @@ AS_IF([test "x$enable_http" = "xyes"],
+ dnl If we have all of the libraries, the json-c and nss libraries,
+ dnl and full C++11 support, we could build the httpd web
+ dnl compilation service.
+- AS_IF([test "x$have_libmicrohttpd" == "xtrue" -a "x$have_libuuid" == "xtrue" -a "x$have_libcurl" == "xtrue" -a "x$have_jsonc" == "xyes" -a "x$have_nss" == "xyes" -a "x$have_openssl" == "xyes" -a "x$have_cxx0x" == "xno"], [have_http_support=yes])])
++ AS_IF([test "x$have_libmicrohttpd" = "xtrue" -a "x$have_libuuid" = "xtrue" -a "x$have_libcurl" = "xtrue" -a "x$have_jsonc" = "xyes" -a "x$have_nss" = "xyes" -a "x$have_openssl" = "xyes" -a "x$have_cxx0x" = "xno"], [have_http_support=yes])])
+
+ AS_IF([test "x$have_http_support" = "xyes"],
+ [AC_DEFINE([HAVE_HTTP_SUPPORT], [1],
+@@ -1010,7 +1010,7 @@ initscript/99stap/module-setup.sh \
+ initscript/99stap/install \
+ initscript/99stap/check ])
+ AC_CONFIG_SUBDIRS(testsuite)
+-if test $enable_translator == "yes"; then
++if test $enable_translator = "yes"; then
+ AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
+ fi
+ AC_CONFIG_FILES([dtrace], [chmod +x dtrace])
diff --git a/dev-util/systemtap/systemtap-4.0-r2.ebuild b/dev-util/systemtap/systemtap-4.0-r2.ebuild
new file mode 100644
index 00000000000..0b43bdd12a7
--- /dev/null
+++ b/dev-util/systemtap/systemtap-4.0-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit linux-info autotools python-single-r1
+
+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="libvirt selinux sqlite +ssl zeroconf"
+
+RDEPEND=">=dev-libs/elfutils-0.142
+ dev-libs/json-c:=
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ ${PYTHON_DEPS}
+ libvirt? ( >=app-emulation/libvirt-1.0.2 )
+ selinux? ( sys-libs/libselinux )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? (
+ dev-libs/nspr
+ dev-libs/nss
+ )
+ zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}
+ app-arch/cpio
+ app-text/xmlto
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ >=sys-devel/gettext-0.18.2
+ libvirt? ( dev-libs/libxml2 )
+"
+RDEPEND="${RDEPEND}
+ acct-group/stapdev
+ acct-group/stapsys
+ acct-group/stapusr
+"
+
+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
+ "${FILESDIR}"/${PN}-4.0-AR.patch
+ "${FILESDIR}"/${P}-configure.ac-non-posix-test.patch
+)
+
+pkg_setup() {
+ 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 zeroconf avahi)
+ $(use_with ssl nss)
+ $(use_with selinux)
+ )
+ PYTHON3="${PYTHON}" \
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ python_optimize
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/systemtap/, dev-util/systemtap/files/
@ 2021-07-16 22:38 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2021-07-16 22:38 UTC (permalink / raw
To: gentoo-commits
commit: 46ed3bebdca73fc1f911e8d3f6afbe4010e9da31
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 22:38:32 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 22:38:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46ed3beb
dev-util/systemtap: drop old version
Bug: https://bugs.gentoo.org/802315
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-util/systemtap/Manifest | 1 -
dev-util/systemtap/files/systemtap-4.0-AR.patch | 11 --
...systemtap-4.0-configure.ac-non-posix-test.patch | 214 ---------------------
dev-util/systemtap/systemtap-4.0-r1.ebuild | 117 -----------
dev-util/systemtap/systemtap-4.0-r2.ebuild | 119 ------------
5 files changed, 462 deletions(-)
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index e7cf61fc39b..1d64fe22ed4 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,3 +1,2 @@
-DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
DIST systemtap-4.4.tar.gz 5532282 BLAKE2B bcb2f744ad09821ce63d78b3e86eb489013aed247952c72d3dbc4cc6fc1a2b85f948b71c622487876f43b615c147eb1624b2c146e9b4176e3c91e2b7cbef9ea0 SHA512 8fb1fe5071ec99ce3c6bcf82afdc98a3e1abc0ea937f3019b225c3a1879ada30080740b1918a84c6db06fe1893e6d1e7dc84be26c7e597d7feda1efe11354e76
DIST systemtap-4.5.tar.gz 5549909 BLAKE2B 3c180a49c81070cb374ae23f95f1e90cc3cf2550170363793f46584b201c2284b2ee639f395d73ed6c5b44160825b3cf128bd360b81bc243e71c98e71d779f48 SHA512 8136779a9f5cb0fbaae565eab1ab6fa307f1024dfc2c6c3845acfadff0eecc684ba89aa5d442c7b90c2c73edaab41ca07bae2bad8361f80fe8e9928b40466cd3
diff --git a/dev-util/systemtap/files/systemtap-4.0-AR.patch b/dev-util/systemtap/files/systemtap-4.0-AR.patch
deleted file mode 100644
index fa5334e6fcf..00000000000
--- a/dev-util/systemtap/files/systemtap-4.0-AR.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/720710
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,6 +22,7 @@ AC_PROG_LN_S
- AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_CPP
-+AM_PROG_AR
- AM_PROG_CC_C_O
- AC_PROG_RANLIB
- AC_OBJEXT
diff --git a/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch b/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch
deleted file mode 100644
index d429ab197dd..00000000000
--- a/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch
+++ /dev/null
@@ -1,214 +0,0 @@
- configure.ac | 62 ++++++++++++++++++++++++++++++------------------------------
- 1 file changed, 31 insertions(+), 31 deletions(-)
-
-diff --git i/configure.ac w/configure.ac
-index caa62ee28..19db3fb21 100644
---- i/configure.ac
-+++ w/configure.ac
-@@ -225,7 +225,7 @@ dnl fi
- # Compiling without fPIE by default (see PR 9922)
- AC_ARG_ENABLE([pie],
- [AS_HELP_STRING([--enable-pie], [enable position-independent-executable])])
--AS_IF([test "x$enable_pie" == xyes],[
-+AS_IF([test "x$enable_pie" = xyes],[
- PIECFLAGS='-fPIE'
- PIECXXFLAGS='-fPIE'
- PIELDFLAGS='-pie -Wl,-z,relro -Wl,-z,now'
-@@ -271,7 +271,7 @@ AC_ARG_ENABLE([translator],
- AS_HELP_STRING([--disable-translator], [build only runtime utilities]),
- [],
- [enable_translator="yes"])
--AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" == "yes"])
-+AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" = "yes"])
-
- dnl Handle the option to build the crash extension
- AC_ARG_ENABLE([crash],
-@@ -312,25 +312,25 @@ AC_CHECK_PROG(have_latex, latex, yes, no)
- AC_CHECK_PROG(have_dvips, dvips, yes, no)
- AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no)
- if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then
-- if test "$enable_docs" == "yes"; then
-+ if test "$enable_docs" = "yes"; then
- AC_MSG_ERROR([cannot find all tools for building documentation])
- fi
-- if test "$enable_docs" == "check"; then
-+ if test "$enable_docs" = "check"; then
- AC_MSG_WARN([will not build documentation, cannot find all tools])
- fi
- fi
--if test "$enable_docs" == "prebuilt"; then
-+if test "$enable_docs" = "prebuilt"; then
- AC_MSG_NOTICE([will only install prebuilt documentation])
- fi
--if test "x${have_latex}${have_dvips}${have_ps2pdf}" == "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
-+if test "x${have_latex}${have_dvips}${have_ps2pdf}" = "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
- building_docs="yes"
- installing_prebuilt_docs="yes"
- fi
--if test "$enable_docs" == "no"; then
-+if test "$enable_docs" = "no"; then
- installing_prebuilt_docs="no"
- fi
--AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"])
--AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" == "yes"])
-+AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" = "yes"])
-+AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" = "yes"])
-
-
- dnl Handle the option to build the reference documentation
-@@ -340,17 +340,17 @@ AC_ARG_ENABLE([refdocs],
- [enable building reference documentation (default on if other documentation built).]),
- [enable_refdocs=$enableval],
- [enable_refdocs="check"])
--if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then
-+if test "$building_docs" = "no" -a "$enable_refdocs" = "yes" ; then
- AC_MSG_ERROR([must use --enable-docs with --enable-refdocs])
- fi
--if test "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
-+if test "$enable_refdocs" != "no" -a "${building_docs}" = "yes"; then
- building_refdocs="yes"
- fi
--AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"])
-+AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" = "yes"])
-
- AC_CHECK_PROG(have_xmlto, xmlto, yes, no)
- AC_CHECK_PROG(have_fop, fop, yes, no)
--if test "x${have_fop}" == "xyes"; then
-+if test "x${have_fop}" = "xyes"; then
- # Due to rhbz505364 / 830266, we must actually test-run fop, not just
- # hope that it works.
- AC_MSG_CHECKING([to see if xmlto --with-fop actually works])
-@@ -362,8 +362,8 @@ if test "x${have_fop}" == "xyes"; then
- fi
- rm -f dummy-tapsets.pdf
- fi
--AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" == "yes"])
--AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" == "yes"])
-+AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = "yes"])
-+AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = "yes"])
-
- dnl Handle the option to build the html documentation
- building_htmldocs="no"
-@@ -372,11 +372,11 @@ AC_ARG_ENABLE([htmldocs],
- [enable building html documentation (default off).]),
- [building_htmldocs=$enableval],
- [building_htmldocs="no"])
--if test "$have_xmlto" == "no" -a "$building_htmldocs" == "yes"; then
-+if test "$have_xmlto" = "no" -a "$building_htmldocs" = "yes"; then
- AC_MSG_ERROR([xmlto required for building html documentation])
- fi
-
--AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" == "yes"])
-+AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" = "yes"])
-
- dnl There is a strange bug in older versions of xmlto when generating pdf.
- dnl https://bugzilla.redhat.com/show_bug.cgi?id=526273
-@@ -396,10 +396,10 @@ cat > conftest.xml << 'EOF'
- </book>
- EOF
-
--if test "x${have_xmlto}" == "xyes"; then
-+if test "x${have_xmlto}" = "xyes"; then
- AC_MSG_CHECKING([for xmlto --stringparam support])
- xmlto --stringparam man.authors.section.enabled=0 html-nochunks conftest.xml >/dev/null 2>&1
-- if test $? == 0; then
-+ if test $? = 0; then
- have_xmlto_stringparam="yes"
- AC_MSG_RESULT([yes])
- else
-@@ -407,7 +407,7 @@ AC_MSG_CHECKING([for xmlto --stringparam support])
- fi
- rm -f conftest.html
- fi
--AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" == "yes"])
-+AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" = "yes"])
-
- rm -f conftest.xml
-
-@@ -473,7 +473,7 @@ dnl See if we have enough libraries and tools to build the compile server
- AC_MSG_WARN([will not build systemtap compile server, cannot find nss headers])
- fi
- fi
--AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" == "yes" -a "$enable_server" != "no"])
-+AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" = "yes" -a "$enable_server" != "no"])
-
- if test "${have_nss}" != "yes"; then
- AC_MSG_WARN([compile-server client functionality will be disabled, cannot find nss development files])
-@@ -514,10 +514,10 @@ if test "$with_rpm" != "no"; then
- AC_DEFINE([HAVE_LIBRPMIO],[1],[have librpmio])
- stap_LIBS="$stap_LIBS -lc -lrpmio"
- have_librpmio="yes"], [have_librpmio="no"])
-- if test "x$have_librpm" != "xyes" -a "$with_rpm" == "yes"; then
-+ if test "x$have_librpm" != "xyes" -a "$with_rpm" = "yes"; then
- AC_MSG_ERROR([cannot find librpm])
- fi
-- if test "x$have_librpmio" != "xyes" -a "$with_rpm" == "yes"; then
-+ if test "x$have_librpmio" != "xyes" -a "$with_rpm" = "yes"; then
- AC_MSG_WARN([cannot find librpmio])
- fi
- fi
-@@ -554,7 +554,7 @@ else
- [Define if you have the readline library (-lreadline).])
- fi
- AC_SUBST([READLINE_LIBS])
--AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" == "yes"])
-+AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" = "yes"])
-
- dnl End of readline checks: restore LIBS
- LIBS=$LIBS_no_readline
-@@ -710,7 +710,7 @@ dnl See if we have enough libraries and tools to build the virt server
- AC_MSG_WARN([will not build systemtap virt support, cannot find xml2 headers])
- fi
- fi
--AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a "${have_libxml2}" == "yes" -a "$enable_virt" != "no"])
-+AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" = "yes" -a "${have_libxml2}" = "yes" -a "$enable_virt" != "no"])
-
- dnl Handle the option to build python2 probe support
- AC_ARG_WITH([python2-probes],
-@@ -750,7 +750,7 @@ have_python3_support=no
- AS_IF([test "x$with_python3_probes" != "xno"],
- [dnl First, check to make sure we have the 'python3-config' script.
- pathless_python3=$(basename "$PYTHON3")
-- if test "x${pathless_python3}" == "x"; then
-+ if test "x${pathless_python3}" = "x"; then
- pathless_python3="python3"
- fi
- AC_PATH_PROG([PYTHON3_CONFIG], [${pathless_python3}-config], [no])
-@@ -785,8 +785,8 @@ AM_CONDITIONAL([HAVE_PYTHON_PROBES],
- dnl Check for presence of json-c and ncurses for use in monitor mode
- PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
- PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
--AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"])
--if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
-+AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" = "yes" -a "${have_ncurses}" = "yes"])
-+if test "${have_jsonc}" = "yes" -a "${have_ncurses}" = yes; then
- AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
- fi
-
-@@ -823,7 +823,7 @@ AS_IF([test "x$with_bpf" != "xno"], [
- [],
- [#include <linux/bpf.h>])
- ])
--AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" == "xyes"])
-+AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" = "xyes"])
- AC_CONFIG_FILES([includes/sys/sdt-config.h po/Makefile.in])
-
- if test $build_elfutils = yes -a $enable_translator = yes; then
-@@ -965,7 +965,7 @@ AS_IF([test "x$enable_http" = "xyes"],
- dnl If we have all of the libraries, the json-c and nss libraries,
- dnl and full C++11 support, we could build the httpd web
- dnl compilation service.
-- AS_IF([test "x$have_libmicrohttpd" == "xtrue" -a "x$have_libuuid" == "xtrue" -a "x$have_libcurl" == "xtrue" -a "x$have_jsonc" == "xyes" -a "x$have_nss" == "xyes" -a "x$have_openssl" == "xyes" -a "x$have_cxx0x" == "xno"], [have_http_support=yes])])
-+ AS_IF([test "x$have_libmicrohttpd" = "xtrue" -a "x$have_libuuid" = "xtrue" -a "x$have_libcurl" = "xtrue" -a "x$have_jsonc" = "xyes" -a "x$have_nss" = "xyes" -a "x$have_openssl" = "xyes" -a "x$have_cxx0x" = "xno"], [have_http_support=yes])])
-
- AS_IF([test "x$have_http_support" = "xyes"],
- [AC_DEFINE([HAVE_HTTP_SUPPORT], [1],
-@@ -1010,7 +1010,7 @@ initscript/99stap/module-setup.sh \
- initscript/99stap/install \
- initscript/99stap/check ])
- AC_CONFIG_SUBDIRS(testsuite)
--if test $enable_translator == "yes"; then
-+if test $enable_translator = "yes"; then
- AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
- fi
- AC_CONFIG_FILES([dtrace], [chmod +x dtrace])
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
deleted file mode 100644
index b3029b7de5e..00000000000
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-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="libvirt selinux sqlite +ssl test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/elfutils-0.142
- dev-libs/json-c:=
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- ${PYTHON_DEPS}
- libvirt? ( >=app-emulation/libvirt-1.0.2 )
- selinux? ( sys-libs/libselinux )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- dev-libs/nspr
- dev-libs/nss
- )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
- app-arch/cpio
- app-text/xmlto
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- >=sys-devel/gettext-0.18.2
- libvirt? ( dev-libs/libxml2 )
-"
-BDEPEND="test? ( dev-util/dejagnu )"
-
-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
- "${FILESDIR}"/${PN}-4.0-AR.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 zeroconf avahi)
- $(use_with ssl nss)
- $(use_with selinux)
- )
- PYTHON3="${PYTHON}" \
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- python_optimize
-}
diff --git a/dev-util/systemtap/systemtap-4.0-r2.ebuild b/dev-util/systemtap/systemtap-4.0-r2.ebuild
deleted file mode 100644
index cb49b3599c9..00000000000
--- a/dev-util/systemtap/systemtap-4.0-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit linux-info autotools python-single-r1
-
-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="libvirt selinux sqlite +ssl test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/elfutils-0.142
- dev-libs/json-c:=
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- ${PYTHON_DEPS}
- libvirt? ( >=app-emulation/libvirt-1.0.2 )
- selinux? ( sys-libs/libselinux )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- dev-libs/nspr
- dev-libs/nss
- )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
- app-arch/cpio
- app-text/xmlto
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- >=sys-devel/gettext-0.18.2
- libvirt? ( dev-libs/libxml2 )
-"
-RDEPEND="${RDEPEND}
- acct-group/stapdev
- acct-group/stapsys
- acct-group/stapusr
-"
-BDEPEND="test? ( dev-util/dejagnu )"
-
-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
- "${FILESDIR}"/${PN}-4.0-AR.patch
- "${FILESDIR}"/${P}-configure.ac-non-posix-test.patch
-)
-
-pkg_setup() {
- 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 zeroconf avahi)
- $(use_with ssl nss)
- $(use_with selinux)
- )
- PYTHON3="${PYTHON}" \
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- python_optimize
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/systemtap/, dev-util/systemtap/files/
@ 2023-05-01 12:39 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2023-05-01 12:39 UTC (permalink / raw
To: gentoo-commits
commit: 9adf543cf8ed8e23a3ee1cd468e2513fe2f298c0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 1 12:38:04 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 1 12:39:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9adf543c
dev-util/systemtap: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/systemtap/Manifest | 4 -
...systemtap-4.4-configure.ac-non-posix-test.patch | 199 ---------------------
dev-util/systemtap/systemtap-4.4.ebuild | 118 ------------
dev-util/systemtap/systemtap-4.5-r1.ebuild | 126 -------------
dev-util/systemtap/systemtap-4.5.ebuild | 115 ------------
dev-util/systemtap/systemtap-4.6.ebuild | 126 -------------
dev-util/systemtap/systemtap-4.7-r1.ebuild | 127 -------------
7 files changed, 815 deletions(-)
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 479702fc8a04..edc1aebe3460 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,5 +1 @@
-DIST systemtap-4.4.tar.gz 5532282 BLAKE2B bcb2f744ad09821ce63d78b3e86eb489013aed247952c72d3dbc4cc6fc1a2b85f948b71c622487876f43b615c147eb1624b2c146e9b4176e3c91e2b7cbef9ea0 SHA512 8fb1fe5071ec99ce3c6bcf82afdc98a3e1abc0ea937f3019b225c3a1879ada30080740b1918a84c6db06fe1893e6d1e7dc84be26c7e597d7feda1efe11354e76
-DIST systemtap-4.5.tar.gz 5549909 BLAKE2B 3c180a49c81070cb374ae23f95f1e90cc3cf2550170363793f46584b201c2284b2ee639f395d73ed6c5b44160825b3cf128bd360b81bc243e71c98e71d779f48 SHA512 8136779a9f5cb0fbaae565eab1ab6fa307f1024dfc2c6c3845acfadff0eecc684ba89aa5d442c7b90c2c73edaab41ca07bae2bad8361f80fe8e9928b40466cd3
-DIST systemtap-4.6.tar.gz 5588126 BLAKE2B 7a0b1ed201f3661d5737bbf2c8b10b8bcf708df0c9aeeb941d501f5001e13b254ff779e20ed6af72b457a9e8236f064b9d5ee6d79438f96abb09d913f5732db3 SHA512 835b45597e9de0ea17857b47d542c87d155cb5c772f8595f41845a25ff06b862cb9c4b635292c3a6c66cb5255a07eee3af7cb7861110a4a05f545a4b35f11402
-DIST systemtap-4.7.tar.gz 5611495 BLAKE2B 839a824c3ef249add3edb2c9329c7bcb297d36d268d463c2913d945688845b7a6af8d811b2a533c4da8ce496cabccbdfabd080be847c754c2614f9c9efb22c61 SHA512 7d7c213dc4f7c5430f81763668da21403fbc351d1701b1096eb1ad233e3f0325e35f01dfd0a33e75f277b26fdde88c46d42dd32e32e4d4f27a45d53e2dd0f831
DIST systemtap-4.8.tar.gz 5628003 BLAKE2B 9f5050eba29d390c907b117187f94ef088f16bb739b4971bc32ffe88b1024a4157cd4e9793a8fc1e149a5a182a28330e3b4fd9d51213bb3637d616fbb9867f6d SHA512 fdcbc48ba17b2155c1419d99147a4cfbee2e69db945bfd0e6881b71ab11165bd23ea7ce9456856ae36807fb18f9934880a6b7c44456b63833ea260038744d9f2
diff --git a/dev-util/systemtap/files/systemtap-4.4-configure.ac-non-posix-test.patch b/dev-util/systemtap/files/systemtap-4.4-configure.ac-non-posix-test.patch
deleted file mode 100644
index bd1c60376834..000000000000
--- a/dev-util/systemtap/files/systemtap-4.4-configure.ac-non-posix-test.patch
+++ /dev/null
@@ -1,199 +0,0 @@
- configure.ac | 58 +++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 29 insertions(+), 29 deletions(-)
-
-diff --git i/configure.ac w/configure.ac
-index 9589fa6f2..2d519f1ba 100644
---- i/configure.ac
-+++ w/configure.ac
-@@ -287,7 +287,7 @@ AC_ARG_ENABLE([translator],
- AS_HELP_STRING([--disable-translator], [build only runtime utilities]),
- [],
- [enable_translator="yes"])
--AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" == "yes"])
-+AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" = "yes"])
-
- dnl Handle the option to build the crash extension
- AC_ARG_ENABLE([crash],
-@@ -328,25 +328,25 @@ AC_CHECK_PROG(have_latex, latex, yes, no)
- AC_CHECK_PROG(have_dvips, dvips, yes, no)
- AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no)
- if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then
-- if test "$enable_docs" == "yes"; then
-+ if test "$enable_docs" = "yes"; then
- AC_MSG_ERROR([cannot find all tools for building documentation])
- fi
-- if test "$enable_docs" == "check"; then
-+ if test "$enable_docs" = "check"; then
- AC_MSG_WARN([will not build documentation, cannot find all tools])
- fi
- fi
--if test "$enable_docs" == "prebuilt"; then
-+if test "$enable_docs" = "prebuilt"; then
- AC_MSG_NOTICE([will only install prebuilt documentation])
- fi
--if test "x${have_latex}${have_dvips}${have_ps2pdf}" == "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
-+if test "x${have_latex}${have_dvips}${have_ps2pdf}" = "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
- building_docs="yes"
- installing_prebuilt_docs="yes"
- fi
--if test "$enable_docs" == "no"; then
-+if test "$enable_docs" = "no"; then
- installing_prebuilt_docs="no"
- fi
--AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"])
--AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" == "yes"])
-+AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" = "yes"])
-+AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" = "yes"])
-
-
- dnl Handle the option to build the reference documentation
-@@ -356,17 +356,17 @@ AC_ARG_ENABLE([refdocs],
- [enable building reference documentation (default on if other documentation built).]),
- [enable_refdocs=$enableval],
- [enable_refdocs="check"])
--if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then
-+if test "$building_docs" = "no" -a "$enable_refdocs" = "yes" ; then
- AC_MSG_ERROR([must use --enable-docs with --enable-refdocs])
- fi
--if test "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
-+if test "$enable_refdocs" != "no" -a "${building_docs}" = "yes"; then
- building_refdocs="yes"
- fi
--AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"])
-+AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" = "yes"])
-
- AC_CHECK_PROG(have_xmlto, xmlto, yes, no)
- AC_CHECK_PROG(have_fop, fop, yes, no)
--if test "x${have_fop}" == "xyes"; then
-+if test "x${have_fop}" = "xyes"; then
- # Due to rhbz505364 / 830266, we must actually test-run fop, not just
- # hope that it works.
- AC_MSG_CHECKING([to see if xmlto --with-fop actually works])
-@@ -378,8 +378,8 @@ if test "x${have_fop}" == "xyes"; then
- fi
- rm -f dummy-tapsets.pdf
- fi
--AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" == "yes"])
--AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" == "yes"])
-+AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = "yes"])
-+AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = "yes"])
-
- dnl Handle the option to build the html documentation
- building_htmldocs="no"
-@@ -388,11 +388,11 @@ AC_ARG_ENABLE([htmldocs],
- [enable building html documentation (default off).]),
- [building_htmldocs=$enableval],
- [building_htmldocs="no"])
--if test "$have_xmlto" == "no" -a "$building_htmldocs" == "yes"; then
-+if test "$have_xmlto" = "no" -a "$building_htmldocs" = "yes"; then
- AC_MSG_ERROR([xmlto required for building html documentation])
- fi
-
--AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" == "yes"])
-+AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" = "yes"])
-
- dnl There is a strange bug in older versions of xmlto when generating pdf.
- dnl https://bugzilla.redhat.com/show_bug.cgi?id=526273
-@@ -412,10 +412,10 @@ cat > conftest.xml << 'EOF'
- </book>
- EOF
-
--if test "x${have_xmlto}" == "xyes"; then
-+if test "x${have_xmlto}" = "xyes"; then
- AC_MSG_CHECKING([for xmlto --stringparam support])
- xmlto --stringparam man.authors.section.enabled=0 html-nochunks conftest.xml >/dev/null 2>&1
-- if test $? == 0; then
-+ if test $? = 0; then
- have_xmlto_stringparam="yes"
- AC_MSG_RESULT([yes])
- else
-@@ -423,7 +423,7 @@ AC_MSG_CHECKING([for xmlto --stringparam support])
- fi
- rm -f conftest.html
- fi
--AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" == "yes"])
-+AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" = "yes"])
-
- rm -f conftest.xml
-
-@@ -489,7 +489,7 @@ dnl See if we have enough libraries and tools to build the compile server
- AC_MSG_WARN([will not build systemtap compile server, cannot find nss headers])
- fi
- fi
--AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" == "yes" -a "$enable_server" != "no"])
-+AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" = "yes" -a "$enable_server" != "no"])
-
- if test "${have_nss}" != "yes"; then
- AC_MSG_WARN([compile-server client functionality will be disabled, cannot find nss development files])
-@@ -530,10 +530,10 @@ if test "$with_rpm" != "no"; then
- AC_DEFINE([HAVE_LIBRPMIO],[1],[have librpmio])
- stap_LIBS="$stap_LIBS -lc -lrpmio"
- have_librpmio="yes"], [have_librpmio="no"])
-- if test "x$have_librpm" != "xyes" -a "$with_rpm" == "yes"; then
-+ if test "x$have_librpm" != "xyes" -a "$with_rpm" = "yes"; then
- AC_MSG_ERROR([cannot find librpm])
- fi
-- if test "x$have_librpmio" != "xyes" -a "$with_rpm" == "yes"; then
-+ if test "x$have_librpmio" != "xyes" -a "$with_rpm" = "yes"; then
- AC_MSG_WARN([cannot find librpmio])
- fi
- fi
-@@ -570,7 +570,7 @@ else
- [Define if you have the readline library (-lreadline).])
- fi
- AC_SUBST([READLINE_LIBS])
--AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" == "yes"])
-+AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" = "yes"])
-
- dnl End of readline checks: restore LIBS
- LIBS=$LIBS_no_readline
-@@ -726,7 +726,7 @@ dnl See if we have enough libraries and tools to build the virt server
- AC_MSG_WARN([will not build systemtap virt support, cannot find xml2 headers])
- fi
- fi
--AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a "${have_libxml2}" == "yes" -a "$enable_virt" != "no"])
-+AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" = "yes" -a "${have_libxml2}" = "yes" -a "$enable_virt" != "no"])
-
- dnl Handle the option to build python2 probe support
- AC_ARG_WITH([python2-probes],
-@@ -801,11 +801,11 @@ if test "$enable_monitor" != "no"; then
- dnl Check for presence of json-c and ncurses for use in monitor mode
- PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
- PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
--if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
-+if test "${have_jsonc}" = "yes" -a "${have_ncurses}" = yes; then
- AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
- fi
- fi
--AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"])
-+AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" = "yes" -a "${have_ncurses}" = "yes" -a "$enable_monitor" != "no"])
-
- AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [
- old_CFLAGS="$CFLAGS"
-@@ -840,7 +840,7 @@ AS_IF([test "x$with_bpf" != "xno"], [
- [],
- [#include <linux/bpf.h>])
- ])
--AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" == "xyes"])
-+AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" = "xyes"])
- AC_CONFIG_FILES([includes/sys/sdt-config.h po/Makefile.in])
-
- dnl determine whether BPF raw tracepoints are available
-@@ -931,7 +931,7 @@ AS_IF([test "x$enable_http" = "xyes"],
- dnl If we have all of the libraries, the json-c and nss libraries,
- dnl and full C++11 support, we could build the httpd web
- dnl compilation service.
-- AS_IF([test "x$have_libmicrohttpd" == "xtrue" -a "x$have_libuuid" == "xtrue" -a "x$have_libcurl" == "xtrue" -a "x$have_jsonc" == "xyes" -a "x$have_nss" == "xyes" -a "x$have_openssl" == "xyes" -a "x$have_cxx0x" == "xno"], [have_http_support=yes])])
-+ AS_IF([test "x$have_libmicrohttpd" = "xtrue" -a "x$have_libuuid" = "xtrue" -a "x$have_libcurl" = "xtrue" -a "x$have_jsonc" = "xyes" -a "x$have_nss" = "xyes" -a "x$have_openssl" = "xyes" -a "x$have_cxx0x" = "xno"], [have_http_support=yes])])
-
- AS_IF([test "x$have_http_support" = "xyes"],
- [AC_DEFINE([HAVE_HTTP_SUPPORT], [1],
-@@ -976,7 +976,7 @@ initscript/99stap/module-setup.sh \
- initscript/99stap/install \
- initscript/99stap/check ])
- AC_CONFIG_SUBDIRS(testsuite)
--if test $enable_translator == "yes"; then
-+if test $enable_translator = "yes"; then
- AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
- fi
- AC_CONFIG_FILES([dtrace], [chmod +x dtrace])
diff --git a/dev-util/systemtap/systemtap-4.4.ebuild b/dev-util/systemtap/systemtap-4.4.ebuild
deleted file mode 100644
index 5452a183404e..000000000000
--- a/dev-util/systemtap/systemtap-4.4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-
-inherit linux-info autotools python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="libvirt selinux sqlite +ssl test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/elfutils-0.142
- dev-libs/json-c:=
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- ${PYTHON_DEPS}
- libvirt? ( >=app-emulation/libvirt-1.0.2 )
- selinux? ( sys-libs/libselinux )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- dev-libs/nspr
- dev-libs/nss
- )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
- app-arch/cpio
- app-text/xmlto
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- >=sys-devel/gettext-0.18.2
- libvirt? ( dev-libs/libxml2 )
-"
-RDEPEND="${RDEPEND}
- acct-group/stapdev
- acct-group/stapsys
- acct-group/stapusr
-"
-BDEPEND="test? ( dev-util/dejagnu )"
-
-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
- "${FILESDIR}"/${P}-configure.ac-non-posix-test.patch
-)
-
-pkg_setup() {
- 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 zeroconf avahi)
- $(use_with ssl nss)
- $(use_with selinux)
- )
- PYTHON3="${PYTHON}" \
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- python_optimize
-}
diff --git a/dev-util/systemtap/systemtap-4.5-r1.ebuild b/dev-util/systemtap/systemtap-4.5-r1.ebuild
deleted file mode 100644
index c0805597cb9c..000000000000
--- a/dev-util/systemtap/systemtap-4.5-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-
-inherit autotools linux-info python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap"
-SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="libvirt selinux sqlite +ssl test zeroconf"
-
-CDEPEND="
- ${PYTHON_DEPS}
-
- >=dev-libs/elfutils-0.142
- dev-libs/json-c:=
- sys-libs/ncurses:0=
- sys-libs/readline:0=
-
- libvirt? ( >=app-emulation/libvirt-1.0.2 )
- selinux? ( sys-libs/libselinux )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- dev-libs/nspr
- dev-libs/nss
- )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="
- ${CDEPEND}
- app-arch/cpio
- app-text/xmlto
- $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
- >=sys-devel/gettext-0.18.2
-
- libvirt? ( dev-libs/libxml2 )
-"
-RDEPEND="
- ${CDEPEND}
- acct-group/stapdev
- acct-group/stapsys
- acct-group/stapusr
-"
-BDEPEND="test? ( dev-util/dejagnu )"
-
-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-PATCHES=(
- "${FILESDIR}/${PN}-3.1-ia64.patch"
-)
-
-pkg_setup() {
- 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
- # Our toolchain sets this for us already and adding in
- # -D_FORTIFY_SOURCE=2 breaks builds w/ no optimisation.
- # This option (at least as of 4.5) doesn't pass -fno* etc,
- # it just doesn't _add_ options, which is good. If it changes
- # to actually pass -fno-stack-protector and friends, we'll
- # need to change course. Forcing =2 also has problems for
- # setting it to 3.
- # bug #794667.
- --disable-ssp
- --enable-pie
- --with-python3
- --without-java
- --without-openssl
- --without-python2-probes
- --without-rpm
- $(use_enable libvirt virt)
- $(use_enable sqlite)
- $(use_with zeroconf avahi)
- $(use_with ssl nss)
- $(use_with selinux)
- )
- PYTHON3="${PYTHON}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- python_optimize
-}
diff --git a/dev-util/systemtap/systemtap-4.5.ebuild b/dev-util/systemtap/systemtap-4.5.ebuild
deleted file mode 100644
index 54becd252a06..000000000000
--- a/dev-util/systemtap/systemtap-4.5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-
-inherit linux-info python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="libvirt selinux sqlite +ssl test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/elfutils-0.142
- dev-libs/json-c:=
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- ${PYTHON_DEPS}
- libvirt? ( >=app-emulation/libvirt-1.0.2 )
- selinux? ( sys-libs/libselinux )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- dev-libs/nspr
- dev-libs/nss
- )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
- app-arch/cpio
- app-text/xmlto
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- >=sys-devel/gettext-0.18.2
- libvirt? ( dev-libs/libxml2 )
-"
-RDEPEND="${RDEPEND}
- acct-group/stapdev
- acct-group/stapsys
- acct-group/stapusr
-"
-BDEPEND="test? ( dev-util/dejagnu )"
-
-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() {
- 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
-}
-
-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 zeroconf avahi)
- $(use_with ssl nss)
- $(use_with selinux)
- )
- PYTHON3="${PYTHON}" \
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- python_optimize
-}
diff --git a/dev-util/systemtap/systemtap-4.6.ebuild b/dev-util/systemtap/systemtap-4.6.ebuild
deleted file mode 100644
index d028afa5ba10..000000000000
--- a/dev-util/systemtap/systemtap-4.6.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-
-inherit autotools linux-info python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap"
-SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="libvirt selinux sqlite +ssl test zeroconf"
-
-CDEPEND="
- ${PYTHON_DEPS}
-
- >=dev-libs/elfutils-0.142
- dev-libs/json-c:=
- sys-libs/ncurses:0=
- sys-libs/readline:0=
-
- libvirt? ( >=app-emulation/libvirt-1.0.2 )
- selinux? ( sys-libs/libselinux )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- dev-libs/nspr
- dev-libs/nss
- )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="
- ${CDEPEND}
- app-arch/cpio
- app-text/xmlto
- $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
- >=sys-devel/gettext-0.18.2
-
- libvirt? ( dev-libs/libxml2 )
-"
-RDEPEND="
- ${CDEPEND}
- acct-group/stapdev
- acct-group/stapsys
- acct-group/stapusr
-"
-BDEPEND="test? ( dev-util/dejagnu )"
-
-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-PATCHES=(
- "${FILESDIR}/${PN}-3.1-ia64.patch"
-)
-
-pkg_setup() {
- 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
- # Our toolchain sets this for us already and adding in
- # -D_FORTIFY_SOURCE=2 breaks builds w/ no optimisation.
- # This option (at least as of 4.5) doesn't pass -fno* etc,
- # it just doesn't _add_ options, which is good. If it changes
- # to actually pass -fno-stack-protector and friends, we'll
- # need to change course. Forcing =2 also has problems for
- # setting it to 3.
- # bug #794667.
- --disable-ssp
- --enable-pie
- --with-python3
- --without-java
- --without-openssl
- --without-python2-probes
- --without-rpm
- $(use_enable libvirt virt)
- $(use_enable sqlite)
- $(use_with zeroconf avahi)
- $(use_with ssl nss)
- $(use_with selinux)
- )
- PYTHON3="${PYTHON}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- python_optimize
-}
diff --git a/dev-util/systemtap/systemtap-4.7-r1.ebuild b/dev-util/systemtap/systemtap-4.7-r1.ebuild
deleted file mode 100644
index e6fadb645899..000000000000
--- a/dev-util/systemtap/systemtap-4.7-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-
-inherit autotools linux-info python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap"
-SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="libvirt selinux sqlite +ssl test zeroconf"
-
-CDEPEND="
- ${PYTHON_DEPS}
-
- dev-libs/boost:=
- >=dev-libs/elfutils-0.142
- dev-libs/json-c:=
- sys-libs/ncurses:=
- sys-libs/readline:=
-
- libvirt? ( >=app-emulation/libvirt-1.0.2 )
- selinux? ( sys-libs/libselinux )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- dev-libs/nspr
- dev-libs/nss
- )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="
- ${CDEPEND}
- app-arch/cpio
- app-text/xmlto
- $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
- >=sys-devel/gettext-0.18.2
-
- libvirt? ( dev-libs/libxml2 )
-"
-RDEPEND="
- ${CDEPEND}
- acct-group/stapdev
- acct-group/stapsys
- acct-group/stapusr
-"
-BDEPEND="test? ( dev-util/dejagnu )"
-
-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-PATCHES=(
- "${FILESDIR}/${PN}-3.1-ia64.patch"
-)
-
-pkg_setup() {
- 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
- # Our toolchain sets this for us already and adding in
- # -D_FORTIFY_SOURCE=2 breaks builds w/ no optimisation.
- # This option (at least as of 4.5) doesn't pass -fno* etc,
- # it just doesn't _add_ options, which is good. If it changes
- # to actually pass -fno-stack-protector and friends, we'll
- # need to change course. Forcing =2 also has problems for
- # setting it to 3.
- # bug #794667.
- --disable-ssp
- --enable-pie
- --with-python3
- --without-java
- --without-openssl
- --without-python2-probes
- --without-rpm
- $(use_enable libvirt virt)
- $(use_enable sqlite)
- $(use_with zeroconf avahi)
- $(use_with ssl nss)
- $(use_with selinux)
- )
- PYTHON3="${PYTHON}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- python_optimize
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-05-01 12:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-07 23:08 [gentoo-commits] repo/gentoo:master commit in: dev-util/systemtap/, dev-util/systemtap/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2020-09-08 22:58 Sergei Trofimovich
2021-01-09 21:38 Sven Wegener
2021-01-09 21:38 Sven Wegener
2021-07-16 22:38 Conrad Kostecki
2023-05-01 12:39 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