Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/flatpak-builder/files/, dev-util/flatpak-builder/
Date: Thu, 07 Apr 2022 01:54:55
Message-Id: 1649296339.f0c051ae8fa760db1ed92bc9bdcaf30d7a53481e.zmedico@gentoo
1 commit: f0c051ae8fa760db1ed92bc9bdcaf30d7a53481e
2 Author: Alfred Persson <cat <AT> catcream <DOT> org>
3 AuthorDate: Thu Apr 7 01:46:53 2022 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 7 01:52:19 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c051ae
7
8 dev-util/flatpak-builder: add musl patch
9
10 Closes: https://bugs.gentoo.org/834671
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 .../files/flatpak-builder-1.2.2-musl.patch | 18 ++++++++++++++++++
14 dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild | 2 ++
15 2 files changed, 20 insertions(+)
16
17 diff --git a/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch b/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch
18 new file mode 100644
19 index 000000000000..db207e0e353c
20 --- /dev/null
21 +++ b/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch
22 @@ -0,0 +1,18 @@
23 +--- a/subprojects/libglnx/glnx-macros.h
24 ++++ b/subprojects/libglnx/glnx-macros.h
25 +@@ -28,6 +28,16 @@
26 +
27 + G_BEGIN_DECLS
28 +
29 ++/* taken from glibc unistd.h and fixes musl */
30 ++#ifndef TEMP_FAILURE_RETRY
31 ++#define TEMP_FAILURE_RETRY(expression) \
32 ++ (__extension__ \
33 ++ ({ long int __result; \
34 ++ do __result = (long int) (expression); \
35 ++ while (__result == -1L && errno == EINTR); \
36 ++ __result; }))
37 ++#endif
38 ++
39 + /* All of these are for C only. */
40 + #ifndef __GI_SCANNER__
41
42 diff --git a/dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild
43 index 990f3dd875d5..f135df85fc71 100644
44 --- a/dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild
45 +++ b/dev-util/flatpak-builder/flatpak-builder-1.2.2.ebuild
46 @@ -33,6 +33,8 @@ BDEPEND="
47 )
48 "
49
50 +PATCHES=("${FILESDIR}/flatpak-builder-1.2.2-musl.patch")
51 +
52 src_configure() {
53 econf \
54 $(use_enable doc documentation) \