commit: 43e759c25a8e2960d3dff78c6696cb257ebaa394 Author: Alfred Persson Forsberg <cat <AT> catcream <DOT> org> AuthorDate: Mon Apr 11 13:49:23 2022 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Apr 11 19:18:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e759c2
dev-util/flatpak-builder: fixed building for musl Closes: https://github.com/gentoo/gentoo/pull/24991 Closes: https://bugs.gentoo.org/834671 Signed-off-by: Alfred Persson Forsberg <cat <AT> catcream.org> Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> ...usl.patch => flatpak-builder-1.0.11-musl.patch} | 4 +- .../files/flatpak-builder-1.2.2-musl.patch | 55 +++++++++++++++++++++- .../flatpak-builder/flatpak-builder-1.0.11.ebuild | 2 + 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch b/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch similarity index 87% copy from dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch copy to dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch index db207e0e353c..b5ef0ec15504 100644 --- a/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch +++ b/dev-util/flatpak-builder/files/flatpak-builder-1.0.11-musl.patch @@ -1,5 +1,5 @@ ---- a/subprojects/libglnx/glnx-macros.h -+++ b/subprojects/libglnx/glnx-macros.h +--- a/libglnx/glnx-macros.h ++++ b/libglnx/glnx-macros.h @@ -28,6 +28,16 @@ G_BEGIN_DECLS 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 index db207e0e353c..626fbddd0352 100644 --- 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 @@ -1,9 +1,59 @@ +diff --git a/subprojects/debugedit/tools/debugedit.c b/subprojects/debugedit/tools/debugedit.c +index 668777a..b3ba5cb 100644 +--- a/subprojects/debugedit/tools/debugedit.c ++++ b/subprojects/debugedit/tools/debugedit.c +@@ -25,7 +25,11 @@ + #include <byteswap.h> + #include <endian.h> + #include <errno.h> ++#ifdef __GLIBC__ + #include <error.h> ++#else ++#include "error.h" ++#endif + #include <limits.h> + #include <string.h> + #include <stdlib.h> +diff --git a/subprojects/debugedit/tools/error.h b/subprojects/debugedit/tools/error.h +new file mode 100644 +index 0000000..c330dc3 +--- /dev/null ++++ b/subprojects/debugedit/tools/error.h +@@ -0,0 +1,26 @@ ++#ifndef _ERROR_H ++#define _ERROR_H ++#include <stdarg.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <errno.h> ++ ++static unsigned int error_message_count = 0; ++ ++static inline void error(int status, int errnum, const char* format, ...) ++{ ++ va_list ap; ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++ fprintf(stderr, ": %s", strerror(errnum)); ++ fprintf(stderr, "\n"); ++ error_message_count++; ++ if (status) ++ exit(status); ++} ++ ++#endif +diff --git a/subprojects/libglnx/glnx-macros.h b/subprojects/libglnx/glnx-macros.h +index 6d8aca9..e3e4e33 100644 --- a/subprojects/libglnx/glnx-macros.h +++ b/subprojects/libglnx/glnx-macros.h @@ -28,6 +28,16 @@ - + G_BEGIN_DECLS - + +/* taken from glibc unistd.h and fixes musl */ +#ifndef TEMP_FAILURE_RETRY +#define TEMP_FAILURE_RETRY(expression) \ @@ -16,3 +66,4 @@ + /* All of these are for C only. */ #ifndef __GI_SCANNER__ + diff --git a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild index a8017f003f1d..20d616e0056d 100644 --- a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild +++ b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild @@ -33,6 +33,8 @@ BDEPEND=" ) " +PATCHES=("${FILESDIR}/flatpak-builder-1.0.11-musl.patch") + src_configure() { econf \ $(use_enable doc documentation) \
