From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/
Date: Sat, 21 Sep 2024 07:41:05 +0000 (UTC) [thread overview]
Message-ID: <1726904443.2a0cd7fb57680fc1401c711822304dcd3b87cdad.mgorny@gentoo> (raw)
commit: 2a0cd7fb57680fc1401c711822304dcd3b87cdad
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 21 05:27:45 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 21 07:40:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0cd7fb
app-arch/libarchive: Avoid the unnecessary dep on sys-apps/attr
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/libarchive-3.7.5-attr-dep.patch | 28 ++++++++++++++++++++++
app-arch/libarchive/libarchive-3.7.5.ebuild | 4 ++--
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/app-arch/libarchive/files/libarchive-3.7.5-attr-dep.patch b/app-arch/libarchive/files/libarchive-3.7.5-attr-dep.patch
new file mode 100644
index 000000000000..3b26c51ea9d9
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.7.5-attr-dep.patch
@@ -0,0 +1,28 @@
+From 44b8e3b676746352cb3e08f76e58510c78209091 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 18 Sep 2024 14:10:58 +0200
+Subject: [PATCH] tar/write.c: Support `sys/xattr.h`
+
+Synchronize the last use of `attr/xattr.h` to support using
+`sys/xattr.h` instead. The former header is deprecated on GNU/Linux,
+and this replacement makes it possible to build libarchive without
+the `attr` package.
+---
+ tar/write.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tar/write.c b/tar/write.c
+index 1d1139f4c..43cd70233 100644
+--- a/tar/write.c
++++ b/tar/write.c
+@@ -32,7 +32,9 @@
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+-#ifdef HAVE_ATTR_XATTR_H
++#if HAVE_SYS_XATTR_H
++#include <sys/xattr.h>
++#elif HAVE_ATTR_XATTR_H
+ #include <attr/xattr.h>
+ #endif
+ #ifdef HAVE_ERRNO_H
diff --git a/app-arch/libarchive/libarchive-3.7.5.ebuild b/app-arch/libarchive/libarchive-3.7.5.ebuild
index dbe3b684bfbd..4a367180b758 100644
--- a/app-arch/libarchive/libarchive-3.7.5.ebuild
+++ b/app-arch/libarchive/libarchive-3.7.5.ebuild
@@ -38,12 +38,10 @@ RDEPEND="
nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
"
-# TODO: fix attr/xattr.h includes and remove sys-apps/attr dep
DEPEND="${RDEPEND}
kernel_linux? (
virtual/os-headers
e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] )
- xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
)
test? (
app-arch/lrzip
@@ -75,6 +73,8 @@ PATCHES=(
"${FILESDIR}/${PN}-3.7.2-lrzip.patch"
# https://github.com/libarchive/libarchive/pull/2330
"${FILESDIR}/${P}-iso9660-times.patch"
+ # https://github.com/libarchive/libarchive/pull/2335
+ "${FILESDIR}/${P}-attr-dep.patch"
)
src_prepare() {
next reply other threads:[~2024-09-21 7:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-21 7:41 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-31 5:00 [gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/files/, app-arch/libarchive/ Michał Górny
2024-09-18 4:37 Michał Górny
2024-05-13 12:53 Michał Górny
2023-09-12 10:25 Michał Górny
2023-08-21 8:59 Michał Górny
2023-07-19 18:33 Michał Górny
2022-12-06 6:02 Michał Górny
2022-08-03 2:25 Sam James
2020-03-10 16:05 Michał Górny
2019-08-15 16:07 Michał Górny
2018-09-10 9:40 Lars Wendler
2017-02-11 17:14 NP Hardass
2016-10-31 22:39 Lars Wendler
2016-07-05 19:26 NP Hardass
2016-07-03 7:05 NP Hardass
2016-01-11 17:04 Ian Stakenvicius
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1726904443.2a0cd7fb57680fc1401c711822304dcd3b87cdad.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox