diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/strace/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-util/strace/Manifest new file mode 100644 index 0000000000..4731f0b60f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/strace/Manifest @@ -0,0 +1 @@ +DIST strace-5.6.tar.xz 1775292 BLAKE2B 6e674e4a1b70a3ebb28aa0097baa07efc7dce18039a3a7d535b4c8b3fc1b11c59ef1eb79e58bbf4b9e2b9621d0840958ba5785d22d0cdcb4c00fb5fa2a3288c1 SHA512 58c8a250e55a018206bee9468ea057c087d5d5bb523339ea3c01e0a19d8f84c95bd1398d66a6dca6ada45c6535aa44b776713a2bb080eebaa734ffb926ac5b38 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch new file mode 100644 index 0000000000..0f277962b9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch @@ -0,0 +1,24 @@ +Based on 52ac53e96143f6aac52738f6e385f75203a68a7b +[PATCH] configure.ac: do not copy CFLAGS to CFLAGS_FOR_{M32,MX32} + +--- a/configure.ac ++++ b/configure.ac +@@ -984,11 +984,14 @@ AS_IF([test x$arch = xaarch64], + ]) + ]) + +-# Setting default compiler variables for personalities ++# Set default compiler variables for personalities. + m4_foreach([pers], [M32, MX32], dnl +- [m4_foreach([var], [CC, CPP, CFLAGS, CPPFLAGS], dnl +- [[: ${]var[_FOR_]pers[=$]var[}] +- AC_SUBST(var[_FOR_]pers)])]) ++ [m4_foreach([var], [CC, CPP, CPPFLAGS], dnl ++ [[: ${]var[_FOR_]pers[=$]var[}] ++ AC_SUBST(var[_FOR_]pers)]) dnl ++ m4_foreach([var], [CFLAGS], dnl ++ [[: ${]var[_FOR_]pers[=][}] ++ AC_SUBST(var[_FOR_]pers)])]) + + st_MPERS([m32], [aarch64|powerpc64|s390x|sparc64|tile|x32|x86_64]) + st_MPERS([mx32], [x86_64]) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/strace/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-util/strace/metadata.xml new file mode 100644 index 0000000000..ed202ff2ec --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/strace/metadata.xml @@ -0,0 +1,22 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + + Enable dev-libs/libaio support for tracing Asynchronous I/O operations + + + Enable stack backtraces (-k flag) via sys-libs/libunwind + + + Enable stack backtraces (-k flag) via dev-libs/elfutils + + + + strace + + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/strace/strace-5.6.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/strace/strace-5.6.ebuild new file mode 100644 index 0000000000..52f7bc430b --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-util/strace/strace-5.6.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/strace/strace.git" + inherit git-r3 autotools +else + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="A useful diagnostic, instructional, and debugging tool" +HOMEPAGE="https://strace.io/" + +LICENSE="BSD" +SLOT="0" +IUSE="aio perl static unwind elfutils" + +REQUIRED_USE="?? ( unwind elfutils )" + +BDEPEND=" + virtual/pkgconfig +" +LIB_DEPEND=" + unwind? ( sys-libs/libunwind[static-libs(+)] ) + elfutils? ( dev-libs/elfutils[static-libs(+)] ) +" +# strace only uses the header from libaio to decode structs +DEPEND=" + static? ( ${LIB_DEPEND} ) + aio? ( >=dev-libs/libaio-0.3.106 ) + sys-kernel/linux-headers +" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + perl? ( dev-lang/perl ) +" + +PATCHES=( +) + +src_prepare() { + default + + eautoreconf + + if [[ ! -e configure ]] ; then + # git generation + sed /autoreconf/d -i bootstrap || die + ./bootstrap || die + eautoreconf + [[ ! -e CREDITS ]] && cp CREDITS{.in,} + fi + + filter-lfs-flags # configure handles this sanely + + export ac_cv_header_libaio_h=$(usex aio) + use elibc_musl && export ac_cv_header_stdc=no + + # Stub out the -k test since it's known to be flaky. #545812 + sed -i '1iexit 77' tests*/strace-k.test || die +} + +src_configure() { + # Set up the default build settings, and then use the names strace expects. + tc-export_build_env BUILD_{CC,CPP} + local v bv + for v in CC CPP {C,CPP,LD}FLAGS ; do + bv="BUILD_${v}" + export "${v}_FOR_BUILD=${!bv}" + done + + # Don't require mpers support on non-multilib systems. #649560 + local myeconfargs=( + --disable-gcc-Werror + --enable-mpers=check + $(use_enable static) + $(use_with unwind libunwind) + $(use_with elfutils libdw) + ) + econf "${myeconfargs[@]}" +} + +src_test() { + if has usersandbox ${FEATURES} ; then + ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044 + return 0 + fi + + default +} + +src_install() { + default + if ! use perl ; then + rm "${ED}"/usr/bin/strace-graph || die + fi + dodoc CREDITS +} diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/strace-5.6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/strace-5.6 new file mode 100644 index 0000000000..5ed312a12a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/strace-5.6 @@ -0,0 +1,15 @@ +BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEFINED_PHASES=configure install prepare test +DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers +DESCRIPTION=A useful diagnostic, instructional, and debugging tool +EAPI=7 +HOMEPAGE=https://strace.io/ +IUSE=aio perl static unwind elfutils +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux +LICENSE=BSD +RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl ) +REQUIRED_USE=?? ( unwind elfutils ) +SLOT=0 +SRC_URI=https://github.com/strace/strace/releases/download/v5.6/strace-5.6.tar.xz +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 +_md5_=1e9ba32013ef424d35f65b746c84c3c0 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 2603fcc854..b429b4f712 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -76,3 +76,5 @@ dev-util/checkbashisms =sys-firmware/sgabios-0.1_pre8-r1 ~amd64 ~arm64 =coreos-devel/fero-client-0.1.1 ** + +>=dev-util/strace-5.3 ~amd64 ~arm64