summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai-Chun Ning <kaichun.ning@gmail.com>2023-03-02 23:47:09 +0000
committerSam James <sam@gentoo.org>2023-03-04 07:18:11 +0000
commit1d924399b054a41948bd19970a4de9b13fd69685 (patch)
treed07df41efe5963b4ea1363100dc3e13df3164bc5 /x11-libs
parentapp-editors/vim-core: configure implicit function declarations (diff)
downloadgentoo-1d924399b054a41948bd19970a4de9b13fd69685.tar.gz
gentoo-1d924399b054a41948bd19970a4de9b13fd69685.tar.bz2
gentoo-1d924399b054a41948bd19970a4de9b13fd69685.zip
x11-libs/cmrt: fix build on musl
Signed-off-by: Kai-Chun Ning <kaichun.ning@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29904 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/cmrt/cmrt-1.0.6-r3.ebuild (renamed from x11-libs/cmrt/cmrt-1.0.6-r2.ebuild)4
-rw-r--r--x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch15
2 files changed, 19 insertions, 0 deletions
diff --git a/x11-libs/cmrt/cmrt-1.0.6-r2.ebuild b/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]