commit: 1d924399b054a41948bd19970a4de9b13fd69685 Author: Kai-Chun Ning <kaichun.ning <AT> gmail <DOT> com> AuthorDate: Thu Mar 2 23:47:09 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 4 07:18:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d924399
x11-libs/cmrt: fix build on musl Signed-off-by: Kai-Chun Ning <kaichun.ning <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29904 Signed-off-by: Sam James <sam <AT> gentoo.org> .../cmrt/{cmrt-1.0.6-r2.ebuild => cmrt-1.0.6-r3.ebuild} | 4 ++++ x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/x11-libs/cmrt/cmrt-1.0.6-r2.ebuild b/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild similarity index 92% rename from x11-libs/cmrt/cmrt-1.0.6-r2.ebuild rename to x11-libs/cmrt/cmrt-1.0.6-r3.ebuild index 335b0341d47e..aa680ed31eb5 100644 --- a/x11-libs/cmrt/cmrt-1.0.6-r2.ebuild +++ b/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild @@ -20,6 +20,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${P}-musl-fix.patch" +) + src_prepare() { default eautoreconf diff --git a/x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch b/x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch new file mode 100644 index 000000000000..91bae74ed8a1 --- /dev/null +++ b/x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch @@ -0,0 +1,15 @@ +diff --git a/src/os_defs.h b/src/os_defs.h +index 82794f5..13539ee 100644 +--- a/src/os_defs.h ++++ b/src/os_defs.h +@@ -109,6 +109,10 @@ typedef struct tagRECT { + + #define CONST const + ++#ifndef __CONCAT ++ #define __CONCAT( a1, a2 ) a1 ## a2 ++#endif ++ + #define __UNIQUENAME( a1, a2 ) __CONCAT( a1, a2 ) + #define UNIQUENAME( __text ) __UNIQUENAME( __text, __COUNTER__ ) + #define STATIC_ASSERT(e) typedef char UNIQUENAME(STATIC_ASSERT_)[(e)?1:-1]
