summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2024-04-28 23:10:42 +1100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2024-04-28 23:11:48 +1100
commit4b0abe03311391d346cd1c5a80f1b96318585d64 (patch)
tree0b929db636f250a9b1648ab3f9b41afab231cc23 /sys-apps/attr
parentapp-misc/carbon-c-relay: fixup metadata.xml (diff)
downloadgentoo-4b0abe03311391d346cd1c5a80f1b96318585d64.tar.gz
gentoo-4b0abe03311391d346cd1c5a80f1b96318585d64.tar.bz2
gentoo-4b0abe03311391d346cd1c5a80f1b96318585d64.zip
sys-apps/attr: Add musl-1.2.5 build fix
Closes: https://bugs.gentoo.org/926294 Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Diffstat (limited to 'sys-apps/attr')
-rw-r--r--sys-apps/attr/attr-2.5.2-r1.ebuild4
-rw-r--r--sys-apps/attr/attr-9999.ebuild4
-rw-r--r--sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch23
3 files changed, 31 insertions, 0 deletions
diff --git a/sys-apps/attr/attr-2.5.2-r1.ebuild b/sys-apps/attr/attr-2.5.2-r1.ebuild
index 850befff79d5..2ba543d8d0e8 100644
--- a/sys-apps/attr/attr-2.5.2-r1.ebuild
+++ b/sys-apps/attr/attr-2.5.2-r1.ebuild
@@ -24,6 +24,10 @@ IUSE="debug nls static-libs"
BDEPEND="nls? ( sys-devel/gettext )"
+PATCHES=(
+ "${FILESDIR}/${PN}-2.5.2-r1-musl-1.2.5.patch"
+)
+
src_prepare() {
default
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index 8aac35056b3e..f240734877d9 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -24,6 +24,10 @@ IUSE="debug nls static-libs"
BDEPEND="nls? ( sys-devel/gettext )"
+PATCHES=(
+ "${FILESDIR}/${PN}-2.5.2-r1-musl-1.2.5.patch"
+)
+
src_prepare() {
default
diff --git a/sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch b/sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch
new file mode 100644
index 000000000000..6a1200ad2f17
--- /dev/null
+++ b/sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch
@@ -0,0 +1,23 @@
+
+If we're not building with glibc, then add its basename definition manually
+
+diff --git a/tools/attr.c b/tools/attr.c
+index f12e4af..d321b37 100644
+--- a/tools/attr.c
++++ b/tools/attr.c
+@@ -33,6 +33,15 @@
+
+ #include "misc.h"
+
++#if !defined(__GLIBC__)
++char *
++basename (const char *filename)
++{
++ char *p = strrchr (filename, '/');
++ return p ? p + 1 : (char *) filename;
++}
++#endif
++
+ #define SETOP 1 /* do a SET operation */
+ #define GETOP 2 /* do a GET operation */
+ #define REMOVEOP 3 /* do a REMOVE operation */