From 3c5e744b791bc7133fc923c043f2d294438d25e8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 1 Jul 2024 07:13:33 +0000 Subject: [PATCH] dev-libs/libtracefs: Sync with Gentoo It's from Gentoo commit 962eb609a997b28764d0639a2e16de2ab2c273ec. --- .../dev-libs/libtracefs/Manifest | 4 +- .../files/libtracefs-1.8.0-mmap.patch | 25 ++++++++ .../libtracefs/libtracefs-1.6.1-r2.ebuild | 55 ----------------- .../libtracefs/libtracefs-1.6.3-r2.ebuild | 55 ----------------- .../libtracefs/libtracefs-1.6.4-r1.ebuild | 61 ------------------- .../libtracefs/libtracefs-1.8.0.ebuild | 53 ++++++++++++++++ 6 files changed, 79 insertions(+), 174 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/files/libtracefs-1.8.0-mmap.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.6.1-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.6.3-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.6.4-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.8.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/Manifest index 234705e75a..fcc9ea55ab 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/Manifest @@ -1,4 +1,2 @@ -DIST libtracefs-1.6.1.tar.gz 193086 BLAKE2B 53f6740c7f06e1d618594e03ec7fbda273bbeb87bfda67acfad1e1670fd69670187c7267af1abcd1502c338499dc8d4ffe28a213b3ad17ff5a6e2b435c1c242f SHA512 9fa9b470869bdc0134cc72eb7a9e0131638c3416d24e403c7fc819d49a5e521ca8c852ece4ac87d6a744c32846a2567c44c1e3b8b329f77db2d89e57c9e36340 -DIST libtracefs-1.6.3.tar.gz 193859 BLAKE2B 89029e59590f4e25c5d39d5b638c381e966e8dee055bf7873492a6cdc8b1e1df90cad84a8db4e1abcacbc43fbb23c9fefbdb53123a409a19d07925e7a39efcdb SHA512 273d008644b5d205def79fa8c1db51f21327c02abee16dfc706cfa7ad421be111ac3280b2dd493a8be5f4d9f2fdcb471d7de17e6b3e56df7cb2f1a11b4e1bfaa -DIST libtracefs-1.6.4.tar.gz 193967 BLAKE2B 24ca0affbd3343429c096795ea25fca6b96c5e806fff197149db290a4b3ed4ad642738a74d395c025b2a5813d9a14ada9b36be8bc0bdbc31d110542fb49ce1ae SHA512 0db20393272ce75c9132fc189993929545f41ac00cc9b0fdbb6adcb4bcda41433f05c047d06d9774f9b00b9e3ed3cfed3879e75365e72c0bb705cf16449e06c4 DIST libtracefs-1.7.0.tar.gz 205716 BLAKE2B 7e11ed75e65ddfb6e95fa67db2d3a3000e722108b6cb9d8efe7f057bf96afa608f0452e42090dab077b59044d3cbaebf2e4361812b994943964ea611b0ec6a49 SHA512 8b95c798a9013c0278da1c68ab4625446e1cc9d437eed91a6ce16660e7787f0af04ab65ce0dba536039f2facca39c50df5e45335b1af630e7bcce70b584e2f0c +DIST libtracefs-1.8.0.tar.gz 224662 BLAKE2B 06ee6872ec5cd6c671ee2ddd3de19356ffa560b3ae20318e36be6a95bfe37bf61233841e32c530ab0a3463d13dd57ff1b09bba296663b25d76da2a2ea3e89f51 SHA512 2d9728186de63f03a2222d56efe6b373c038519ad1e81dd10d97640c296696df6b0661743dcd9e851edda5225342ea10a8746434439f7ad878e26780b797eb6c diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/files/libtracefs-1.8.0-mmap.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/files/libtracefs-1.8.0-mmap.patch new file mode 100644 index 0000000000..1500031886 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/files/libtracefs-1.8.0-mmap.patch @@ -0,0 +1,25 @@ +Subject: [PATCH] libtracefs meson: build tracefs-mmap by default + +Accordingly to Makefile let's add tracefs-mmap.c to build, this is needed +for linking by other object files. + +Link: https://lore.kernel.org/linux-trace-devel/20240110203925.266999-1-giulio.benetti@benettiengineering.com +--- + src/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/meson.build b/src/meson.build +index 5b76554..f7a98b9 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -11,6 +11,7 @@ sources= [ + 'tracefs-instance.c', + 'tracefs-kprobes.c', + 'tracefs-marker.c', ++ 'tracefs-mmap.c', + 'tracefs-record.c', + 'tracefs-sqlhist.c', + 'tracefs-tools.c', +-- +2.43.0 + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.6.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.6.1-r2.ebuild deleted file mode 100644 index e5a02ff37b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.6.1-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Linux kernel trace file system library" -HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" - -if [[ ${PV} =~ [9]{4,} ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" - inherit git-r3 -else - SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 ~x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="doc" - -RDEPEND=" - !=dev-libs/libtraceevent-1.3.0 -" -DEPEND="${RDEPEND}" -# source-highlight is needed, see bug https://bugs.gentoo.org/865469 -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight ) -" - -src_configure() { - EMAKE_FLAGS=( - "prefix=${EPREFIX}/usr" - "libdir=${EPREFIX}/usr/$(get_libdir)" - "CC=$(tc-getCC)" - "AR=$(tc-getAR)" - VERBOSE=1 - ) -} - -src_compile() { - emake "${EMAKE_FLAGS[@]}" - use doc && emake doc -} - -src_install() { - emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install - # can't prevent installation of the static lib with parameters - rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die - # install-doc is wrong target, see https://bugs.gentoo.org/865465 - use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install_doc -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.6.3-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.6.3-r2.ebuild deleted file mode 100644 index 8586159db3..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.6.3-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Linux kernel trace file system library" -HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" - -if [[ ${PV} =~ [9]{4,} ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" - inherit git-r3 -else - SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="doc" - -RDEPEND=" - !=dev-libs/libtraceevent-1.3.0 -" -DEPEND="${RDEPEND}" -# source-highlight is needed, see bug https://bugs.gentoo.org/865469 -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight ) -" - -src_configure() { - EMAKE_FLAGS=( - "prefix=${EPREFIX}/usr" - "libdir=${EPREFIX}/usr/$(get_libdir)" - "CC=$(tc-getCC)" - "AR=$(tc-getAR)" - VERBOSE=1 - ) -} - -src_compile() { - emake "${EMAKE_FLAGS[@]}" - use doc && emake doc -} - -src_install() { - emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install - # can't prevent installation of the static lib with parameters - rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die - # install-doc is wrong target, see https://bugs.gentoo.org/865465 - use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install_doc -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.6.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.6.4-r1.ebuild deleted file mode 100644 index 0fa9a748d6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.6.4-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Linux kernel trace file system library" -HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" - -if [[ ${PV} =~ [9]{4,} ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" - inherit git-r3 -else - SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="doc" - -RDEPEND=" - !=dev-libs/libtraceevent-1.3.0 -" -DEPEND="${RDEPEND}" -# source-highlight is needed, see bug https://bugs.gentoo.org/865469 -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight ) -" - -src_prepare() { - default - sed -i -e "s|share/doc/libtracefs-doc|share/doc/libtracefs-${PV}|g" \ - Documentation/Makefile || die -} - -src_configure() { - EMAKE_FLAGS=( - "prefix=${EPREFIX}/usr" - "libdir=${EPREFIX}/usr/$(get_libdir)" - "CC=$(tc-getCC)" - "AR=$(tc-getAR)" - VERBOSE=1 - ) -} - -src_compile() { - emake "${EMAKE_FLAGS[@]}" - use doc && emake doc -} - -src_install() { - emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install - # can't prevent installation of the static lib with parameters - rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die - # install-doc is wrong target, see https://bugs.gentoo.org/865465 - use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install_doc -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.8.0.ebuild new file mode 100644 index 0000000000..b1d311a9f1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libtracefs/libtracefs-1.8.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="Linux kernel trace file system library" +HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" + +if [[ ${PV} =~ [9]{4,} ]]; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/" + inherit git-r3 +else + SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +LICENSE="LGPL-2.1" +SLOT="0" + +# Please double check the minimum libtraceevent version! +RDEPEND=" + >=dev-libs/libtraceevent-1.8.1 +" +DEPEND="${RDEPEND}" +# source-highlight is needed, see bug https://bugs.gentoo.org/865469 +BDEPEND=" + app-text/asciidoc + app-text/xmlto + dev-util/source-highlight + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}/${P}-mmap.patch" ) + +src_configure() { + local emesonargs=( + -Dasciidoctor=false + -Ddoc=false + ) + + # TODO: get docs & tests optional upstream + meson_src_configure +} + +src_install() { + meson_src_install + + find "${ED}" -type f -name '*.a' -delete || die +}