Skip to Content.
Sympa Menu

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

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, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (b1398e1426ef014ce325ae8f0dc3a79e8ea0082e)
  • Date: Tue, 25 Jun 2024 11:48:06 +0000

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

shell-term-fm/bash/HISTORY
| 4 +
shell-term-fm/bash/PRE_BUILD
| 2
shell-term-fm/bash/patches/0001-libsh-Omit-strtoimax-if-HAVE_STRTOIMAX.patch
| 38 ++++++++++
3 files changed, 44 insertions(+)

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

bash: Fix static build

The unconditional inclusion of strtoimax caused a linking failure (at
least
when compiling agaist musl libc).

diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index 235ac7d..0a92d12 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,7 @@
+2024-06-25 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD,
patches/0001-libsh-Omit-strtoimax-if-HAVE_STRTOIMAX.patch:
+ fixed static build
+
2024-01-16 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 5.2.26

diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD
index 67523f9..ea48722 100755
--- a/shell-term-fm/bash/PRE_BUILD
+++ b/shell-term-fm/bash/PRE_BUILD
@@ -9,6 +9,8 @@ for ((i=5; i<=2*BASH_PATCHLEVEL + 3; i+=2)); do
patch -p0 < ${SOURCE_CACHE}/${!patchname}
done &&

+apply_patch_dir patches &&
+
if [[ "$BASH_NI_LOGIN" == y ]]; then
message "${MESSAGE_COLOR}Defining
NON_INTERACTIVE_LOGIN_SHELLS.$DEFAULT_COLOR" &&
sed -i 's/\/\* \(#define NON_INTERACTIVE_LOGIN_SHELLS\) \*\//\1/'
config-top.h
diff --git
a/shell-term-fm/bash/patches/0001-libsh-Omit-strtoimax-if-HAVE_STRTOIMAX.patch

b/shell-term-fm/bash/patches/0001-libsh-Omit-strtoimax-if-HAVE_STRTOIMAX.patch
new file mode 100644
index 0000000..24ae33c
--- /dev/null
+++
b/shell-term-fm/bash/patches/0001-libsh-Omit-strtoimax-if-HAVE_STRTOIMAX.patch
@@ -0,0 +1,38 @@
+From 740427d50b7d596977380831327948e1485e519c Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Tue, 25 Jun 2024 08:31:07 +0200
+Subject: [PATCH] libsh: Omit strtoimax if HAVE_STRTOIMAX
+
+Upstream-Status: Pending
+Origin: Source Mage
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ lib/sh/strtoimax.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/lib/sh/strtoimax.c b/lib/sh/strtoimax.c
+index 584fa0ba20f5..7deab27bd692 100644
+--- a/lib/sh/strtoimax.c
++++ b/lib/sh/strtoimax.c
+@@ -20,9 +20,9 @@
+
+ /* Written by Paul Eggert. Modified by Chet Ramey for Bash. */
+
+-#if HAVE_CONFIG_H
+-# include <config.h>
+-#endif
++#include <config.h>
++
++#if !HAVE_STRTOIMAX
+
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+@@ -111,3 +111,5 @@ main ()
+ exit (0);
+ }
+ #endif
++
++#endif /* !HAVE_STRTOIMAX */
+--
+2.44.0
+


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (b1398e1426ef014ce325ae8f0dc3a79e8ea0082e), Ismael Luceno, 06/25/2024

Archive powered by MHonArc 2.6.24.

Top of Page