Skip to Content.
Sympa Menu

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

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 (c2501d7a3e49d80028ee573d4adf6b9d703b39b0)
  • Date: Mon, 22 Jun 2020 19:42:03 +0000

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

shell-term-fm/unixtree/HISTORY |
4 +
shell-term-fm/unixtree/PRE_BUILD |
3
shell-term-fm/unixtree/patches/0001-Fix-build-on-non-glibc-systems.patch |
39 ++++++++++
3 files changed, 46 insertions(+)

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

unixtree: Fix build against musl libc

diff --git a/shell-term-fm/unixtree/HISTORY b/shell-term-fm/unixtree/HISTORY
index 5e8a3bb..3115428 100644
--- a/shell-term-fm/unixtree/HISTORY
+++ b/shell-term-fm/unixtree/HISTORY
@@ -1,3 +1,7 @@
+2020-06-22 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, patches/0001-Fix-build-on-non-glibc-systems.patch:
+ Fixed build against musl libc
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/shell-term-fm/unixtree/PRE_BUILD
b/shell-term-fm/unixtree/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/shell-term-fm/unixtree/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git
a/shell-term-fm/unixtree/patches/0001-Fix-build-on-non-glibc-systems.patch
b/shell-term-fm/unixtree/patches/0001-Fix-build-on-non-glibc-systems.patch
new file mode 100644
index 0000000..f21c3a4
--- /dev/null
+++ b/shell-term-fm/unixtree/patches/0001-Fix-build-on-non-glibc-systems.patch
@@ -0,0 +1,39 @@
+From a8c2c6763ab7037e68a525305f0577845a797ae1 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Mon, 22 Jun 2020 21:32:14 +0200
+Subject: [PATCH] Fix build on non-glibc systems
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ libsys/systhread.c | 2 +-
+ libxvt/xvtcommon.h | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libsys/systhread.c b/libsys/systhread.c
+index e33bc0dd319f..06bc127598c4 100644
+--- a/libsys/systhread.c
++++ b/libsys/systhread.c
+@@ -380,7 +380,7 @@ void sysmutex_init (THREAD_MUTEX *mp)
+ tm->initialized = TRUE;
+ tm->depth = 0;
+ pthread_mutexattr_init(&tm->cs.m_unix.attr);
+-#if defined(linux)
++#if defined(linux) && defined(__GLIBC__)
+ pthread_mutexattr_settype(&tm->cs.m_unix.attr,
+ PTHREAD_MUTEX_RECURSIVE_NP);
+ #else
+diff --git a/libxvt/xvtcommon.h b/libxvt/xvtcommon.h
+index 36e7bec60cbf..b8ef2b993122 100644
+--- a/libxvt/xvtcommon.h
++++ b/libxvt/xvtcommon.h
+@@ -31,6 +31,7 @@ typedef int pid_t;
+
+ # include <unistd.h>
+ # include <termios.h>
++# include <sys/ttydefaults.h>
+ # include <sys/wait.h>
+ # include <sys/time.h>
+ # include <sys/socket.h>
+--
+2.27.0
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c2501d7a3e49d80028ee573d4adf6b9d703b39b0), Ismael Luceno, 06/22/2020

Archive powered by MHonArc 2.6.24.

Top of Page