Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (06e4476e42dcf27f1f50b530882ddcb21e131801)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (06e4476e42dcf27f1f50b530882ddcb21e131801)
  • Date: Mon, 5 Sep 2022 12:34:31 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

devel/binutils/BUILD | 7
++
devel/binutils/HISTORY | 3
+
x11-libs/cairo/DEPENDS | 4
+
x11-libs/cairo/HISTORY | 4
+
x11-libs/cairo/patches/0001-Fix-build-with-external-libexecinfo.patch | 28
++++++++++
5 files changed, 46 insertions(+)

New commits:
commit 06e4476e42dcf27f1f50b530882ddcb21e131801
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

cairo: Fix build against libexecinfo

commit 59e28ff7adac645c1a50d5a26ee4244e0ecffe78
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

binutils: Fix build against musl

diff --git a/devel/binutils/BUILD b/devel/binutils/BUILD
index 3021f13..0e4a05c 100755
--- a/devel/binutils/BUILD
+++ b/devel/binutils/BUILD
@@ -1,3 +1,10 @@
+case "$HOST" in
+ (*-musl)
+ # FIXME gprofng doesn't build with musl
+ OPTS+=' --disable-gprofng'
+ ;;
+esac &&
+
if [[ $BINUTILS_LTO == "y" ]];then
OPTS+=" --enable-lto"
fi &&
diff --git a/devel/binutils/HISTORY b/devel/binutils/HISTORY
index 7409083..c534a8e 100644
--- a/devel/binutils/HISTORY
+++ b/devel/binutils/HISTORY
@@ -1,3 +1,6 @@
+2022-09-05 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: fixed build against musl
+
2022-08-21 Pavel Vinogradov <public AT sourcemage.org>
* INSTALL: switched to find + cpio for real installation

diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index 5d77248..46892ee 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 714a258..80ca8b6 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2022-09-05 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, 0001-Fix-build-with-external-libexecinfo.patch:
+ fix build against libexecinfo
+
2022-08-13 Pavel Vinogradov <public AT 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 0000000..77a80ad
--- /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 AT 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 AT 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



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (06e4476e42dcf27f1f50b530882ddcb21e131801), Ismael Luceno, 09/05/2022

Archive powered by MHonArc 2.6.24.

Top of Page