diff options
| author | Ismael Luceno | 2022-09-05 14:33:57 +0200 |
|---|---|---|
| committer | Ismael Luceno | 2022-09-05 14:33:57 +0200 |
| commit | 06e4476e42dcf27f1f50b530882ddcb21e131801 (patch) | |
| tree | 380c5456a990c083130fc25f72e808082d7073e4 /x11-libs | |
| parent | 59e28ff7adac645c1a50d5a26ee4244e0ecffe78 (diff) | |
cairo: Fix build against libexecinfo
Diffstat (limited to 'x11-libs')
| -rwxr-xr-x | x11-libs/cairo/DEPENDS | 4 | ||||
| -rw-r--r-- | x11-libs/cairo/HISTORY | 4 | ||||
| -rw-r--r-- | x11-libs/cairo/patches/0001-Fix-build-with-external-libexecinfo.patch | 28 |
3 files changed, 36 insertions, 0 deletions
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS index 5d77248e7b..46892ee9ab 100755 --- a/x11-libs/cairo/DEPENDS +++ b/x11-libs/cairo/DEPENDS @@ -1,6 +1,10 @@ . "$GRIMOIRE/FUNCTIONS" && . "${GRIMOIRE}/MESON_DEPENDS" && +case "$HOST" in + (*-musl) depends libexecinfo ;; +esac && + if [[ "${CAIRO_BRANCH}" == "scm" ]]; then depends git fi && diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY index 714a258c8e..80ca8b61ef 100644 --- a/x11-libs/cairo/HISTORY +++ b/x11-libs/cairo/HISTORY @@ -1,3 +1,7 @@ +2022-09-05 Ismael Luceno <ismael@sourcemage.org> + * DEPENDS, 0001-Fix-build-with-external-libexecinfo.patch: + fix build against libexecinfo + 2022-08-13 Pavel Vinogradov <public@sourcemage.org> * CONFIGURE, DEPENDS: moved cleanup code to one place * SUB_DEPENDS: fixed a typo (kudos to SneakyThunder) diff --git a/x11-libs/cairo/patches/0001-Fix-build-with-external-libexecinfo.patch b/x11-libs/cairo/patches/0001-Fix-build-with-external-libexecinfo.patch new file mode 100644 index 0000000000..77a80ade24 --- /dev/null +++ b/x11-libs/cairo/patches/0001-Fix-build-with-external-libexecinfo.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ismael Luceno <ismael@iodev.co.uk> +Subject: [PATCH] Fix build with external libexecinfo +Date: Mon, 5 Sep 2022 11:44:43 +0200 + +The backtracing functions may be implemented on a separate library instead +of in the libc, so try to find it. + +Origin: Source Mage GNU/Linux +Upstream-Status: Pending +Signed-off-by: Ismael Luceno <ismael@iodev.co.uk> +--- + util/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/util/meson.build b/util/meson.build +index 5cc209cc9288..54f0f8406f9f 100644 +--- a/util/meson.build ++++ b/util/meson.build +@@ -60,5 +60,7 @@ foreach util : cairo_utils + endforeach + + if conf.get('CAIRO_HAS_DLSYM', 0) == 1 and cc.has_header('execinfo.h') +- libmallocstats = library('malloc-stats', 'malloc-stats.c', dependencies : dl_dep) ++ execinfo_dep = cc.find_library('execinfo', required: false) ++ libmallocstats = library('malloc-stats', 'malloc-stats.c', ++ dependencies: [dl_dep, execinfo_dep]) + endif |