summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2022-11-05 15:48:44 -0700
committerZac Medico <zmedico@gentoo.org>2022-11-05 16:08:56 -0700
commitb09efe8df162f8c422196ef872235a06b0f622bd (patch)
tree591e049508a6e2c20d9e8267fc3a9f3346863c4a /dev-util/ostree
parentdev-php/snuffleupagus: Drop old (diff)
downloadgentoo-b09efe8df162f8c422196ef872235a06b0f622bd.tar.gz
gentoo-b09efe8df162f8c422196ef872235a06b0f622bd.tar.bz2
gentoo-b09efe8df162f8c422196ef872235a06b0f622bd.zip
dev-util/ostree: add patch to fix musl build
Closes: https://bugs.gentoo.org/879321 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'dev-util/ostree')
-rw-r--r--dev-util/ostree/files/ostree-2022.6-musl-allperms.patch17
-rw-r--r--dev-util/ostree/ostree-2022.6.ebuild4
2 files changed, 21 insertions, 0 deletions
diff --git a/dev-util/ostree/files/ostree-2022.6-musl-allperms.patch b/dev-util/ostree/files/ostree-2022.6-musl-allperms.patch
new file mode 100644
index 000000000000..9f4f2a21eb14
--- /dev/null
+++ b/dev-util/ostree/files/ostree-2022.6-musl-allperms.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/879321
+
+From: ernsteiswuerfel <erhard_f@mailbox.org>
+
+--- a/src/libostree/ostree-repo-checkout.c
++++ b/src/libostree/ostree-repo-checkout.c
+@@ -37,6 +37,10 @@
+
+ #define OVERLAYFS_WHITEOUT_PREFIX ".ostree-wh."
+
++#if !defined(ALLPERMS)
++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */
++#endif
++
+ /* Per-checkout call state/caching */
+ typedef struct {
+ GString *path_buf; /* buffer for real path if filtering enabled */
diff --git a/dev-util/ostree/ostree-2022.6.ebuild b/dev-util/ostree/ostree-2022.6.ebuild
index b673c6196958..f5456a6e416e 100644
--- a/dev-util/ostree/ostree-2022.6.ebuild
+++ b/dev-util/ostree/ostree-2022.6.ebuild
@@ -63,6 +63,10 @@ BDEPEND="
S="${WORKDIR}/lib${P}"
+PATCHES=(
+ "${FILESDIR}"/${P}-musl-allperms.patch
+)
+
src_prepare() {
default