* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libtracefs/files/, dev-libs/libtracefs/
@ 2022-08-16 16:38 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-08-16 16:38 UTC (permalink / raw
To: gentoo-commits
commit: 7864d3d2f3e2a7f87341328afc4074f0ffd113b7
Author: brahmajit das <listout <AT> protonmail <DOT> com>
AuthorDate: Tue Aug 16 16:25:49 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 16:38:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7864d3d2
dev-libs/libtracefs: Fix pthread_mutex_t unknown type on musl
On musl it is necessary to include pthread header else the compiler cannot
identify pthread_mutex_t as a known type
Closes: https://bugs.gentoo.org/855893
Signed-off-by: brahmajit das <listout <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26882
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libtracefs/files/libtracefs-1.3.1-musl-pthread.patch | 16 ++++++++++++++++
dev-libs/libtracefs/libtracefs-1.3.1.ebuild | 4 ++++
2 files changed, 20 insertions(+)
diff --git a/dev-libs/libtracefs/files/libtracefs-1.3.1-musl-pthread.patch b/dev-libs/libtracefs/files/libtracefs-1.3.1-musl-pthread.patch
new file mode 100644
index 000000000000..0f909111150d
--- /dev/null
+++ b/dev-libs/libtracefs/files/libtracefs-1.3.1-musl-pthread.patch
@@ -0,0 +1,16 @@
+# On musl it is necessary to include pthread header else the compiler cannot
+# identify pthread_mutex_t as a known type
+# Closes: https://bugs.gentoo.org/855893
+diff --git a/include/tracefs-local.h b/include/tracefs-local.h
+index 926fd02..779e853 100644
+--- a/include/tracefs-local.h
++++ b/include/tracefs-local.h
+@@ -6,6 +6,8 @@
+ #ifndef _TRACE_FS_LOCAL_H
+ #define _TRACE_FS_LOCAL_H
+
++#include <pthread.h>
++
+ #define __hidden __attribute__((visibility ("hidden")))
+ #define __weak __attribute__((weak))
+
diff --git a/dev-libs/libtracefs/libtracefs-1.3.1.ebuild b/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
index ae5b3a5331b9..d5ffcefc4d9b 100644
--- a/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
+++ b/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
@@ -28,6 +28,10 @@ BDEPEND="
doc? ( app-text/xmlto app-text/asciidoc )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.1-musl-pthread.patch
+)
+
src_configure() {
EMAKE_FLAGS=(
"prefix=${EPREFIX}/usr"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libtracefs/files/, dev-libs/libtracefs/
@ 2023-01-12 23:35 Yixun Lan
0 siblings, 0 replies; 2+ messages in thread
From: Yixun Lan @ 2023-01-12 23:35 UTC (permalink / raw
To: gentoo-commits
commit: 511362ea7460ba49dd7bdbb527369e4499076989
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 22:10:07 2023 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 23:33:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=511362ea
dev-libs/libtracefs: drop 1.3.1, 1.4.2, 1.5.0
cleanup old after stabilization, wrt #889634
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-libs/libtracefs/Manifest | 3 --
.../files/libtracefs-1.3.1-musl-pthread.patch | 16 ------
.../files/libtracefs-1.4.2-fix-test.patch | 11 -----
dev-libs/libtracefs/libtracefs-1.3.1.ebuild | 57 ----------------------
dev-libs/libtracefs/libtracefs-1.4.2.ebuild | 57 ----------------------
dev-libs/libtracefs/libtracefs-1.5.0.ebuild | 53 --------------------
6 files changed, 197 deletions(-)
diff --git a/dev-libs/libtracefs/Manifest b/dev-libs/libtracefs/Manifest
index 90ef82213231..e2c7d75c996e 100644
--- a/dev-libs/libtracefs/Manifest
+++ b/dev-libs/libtracefs/Manifest
@@ -1,5 +1,2 @@
-DIST libtracefs-1.3.1.tar.gz 175453 BLAKE2B d9801c9f50513a8b2d2de57f768aec69c3e47b4c41ba1e887b28465d3a0a6bf10e5d2c60f81615615176bdb65e10ef7e2b7dee5cbb214705cc69e55bb923231c SHA512 1d8423ff1033a4ab601dd8e9fa4a801c27425234505070733641c8c9a4dd382cc6563d3fde89958f18e0bc95e2cbbdf65e69a2935fe208d5de9fd3ac26374ec1
-DIST libtracefs-1.4.2.tar.gz 178382 BLAKE2B a956423370077613417812ad18da284521e8798701d558f4e419af6c43bd8a06c489525bbab26e6bc5d5d5e8fd0e6a7322d34f976a4ea560670eb594818d07fc SHA512 4a66c3cf8050de5acc4c63996cbcfa2c014e26ad6011eb89b0cff47ffbd6343637009354edf6bb173b9fd08103012774376c33fd6f642741f7990f2d6de3ea0c
-DIST libtracefs-1.5.0.tar.gz 179569 BLAKE2B d69d4bb2c9cbf6dd971afaad280534ce8af4982ca76c7b12cb8432f56a01d622a5d58c827cfe86537e5db2a416ab1092c95309b77b766b183266e1ad22ad8d13 SHA512 5e936a788473c0eb373144231ef9ac139ae53b4685053dfed74157a9432d429f35b70290607679eae9f44fd858d2102a02c3beac35d8de35d856c3c1001644d3
DIST libtracefs-1.6.1.tar.gz 193086 BLAKE2B 53f6740c7f06e1d618594e03ec7fbda273bbeb87bfda67acfad1e1670fd69670187c7267af1abcd1502c338499dc8d4ffe28a213b3ad17ff5a6e2b435c1c242f SHA512 9fa9b470869bdc0134cc72eb7a9e0131638c3416d24e403c7fc819d49a5e521ca8c852ece4ac87d6a744c32846a2567c44c1e3b8b329f77db2d89e57c9e36340
DIST libtracefs-1.6.3.tar.gz 193859 BLAKE2B 89029e59590f4e25c5d39d5b638c381e966e8dee055bf7873492a6cdc8b1e1df90cad84a8db4e1abcacbc43fbb23c9fefbdb53123a409a19d07925e7a39efcdb SHA512 273d008644b5d205def79fa8c1db51f21327c02abee16dfc706cfa7ad421be111ac3280b2dd493a8be5f4d9f2fdcb471d7de17e6b3e56df7cb2f1a11b4e1bfaa
diff --git a/dev-libs/libtracefs/files/libtracefs-1.3.1-musl-pthread.patch b/dev-libs/libtracefs/files/libtracefs-1.3.1-musl-pthread.patch
deleted file mode 100644
index 0f909111150d..000000000000
--- a/dev-libs/libtracefs/files/libtracefs-1.3.1-musl-pthread.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# On musl it is necessary to include pthread header else the compiler cannot
-# identify pthread_mutex_t as a known type
-# Closes: https://bugs.gentoo.org/855893
-diff --git a/include/tracefs-local.h b/include/tracefs-local.h
-index 926fd02..779e853 100644
---- a/include/tracefs-local.h
-+++ b/include/tracefs-local.h
-@@ -6,6 +6,8 @@
- #ifndef _TRACE_FS_LOCAL_H
- #define _TRACE_FS_LOCAL_H
-
-+#include <pthread.h>
-+
- #define __hidden __attribute__((visibility ("hidden")))
- #define __weak __attribute__((weak))
-
diff --git a/dev-libs/libtracefs/files/libtracefs-1.4.2-fix-test.patch b/dev-libs/libtracefs/files/libtracefs-1.4.2-fix-test.patch
deleted file mode 100644
index fb2bdb2f5995..000000000000
--- a/dev-libs/libtracefs/files/libtracefs-1.4.2-fix-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-# Fix PATH_MAX not defined due to missing limits.h
---- a/utest/tracefs-utest.c
-+++ b/utest/tracefs-utest.c
-@@ -11,6 +11,7 @@
- #include <time.h>
- #include <dirent.h>
- #include <ftw.h>
-+#include <limits.h>
-
- #include <CUnit/CUnit.h>
- #include <CUnit/Basic.h>
diff --git a/dev-libs/libtracefs/libtracefs-1.3.1.ebuild b/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
deleted file mode 100644
index f3049d954da5..000000000000
--- a/dev-libs/libtracefs/libtracefs-1.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2019-2022 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 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.1-musl-pthread.patch
-)
-
-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/dev-libs/libtracefs/libtracefs-1.4.2.ebuild b/dev-libs/libtracefs/libtracefs-1.4.2.ebuild
deleted file mode 100644
index 70e3e35683e6..000000000000
--- a/dev-libs/libtracefs/libtracefs-1.4.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2019-2022 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 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.2-fix-test.patch
-)
-
-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/dev-libs/libtracefs/libtracefs-1.5.0.ebuild b/dev-libs/libtracefs/libtracefs-1.5.0.ebuild
deleted file mode 100644
index 440403770349..000000000000
--- a/dev-libs/libtracefs/libtracefs-1.5.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2019-2022 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-12 23:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-16 16:38 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libtracefs/files/, dev-libs/libtracefs/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-01-12 23:35 Yixun Lan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox