Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (a4ead3592860c1a0887bf0c77cd9c99a834e76b9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (a4ead3592860c1a0887bf0c77cd9c99a834e76b9)
  • Date: Sun, 20 Nov 2022 12:46:25 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

libs/gmp/BUILD | 6 +++++-
libs/gmp/HISTORY | 3 +++
libs/gmp/INSTALL | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit a4ead3592860c1a0887bf0c77cd9c99a834e76b9
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gmp: do not depend on gmp being installed

diff --git a/libs/gmp/BUILD b/libs/gmp/BUILD
index 063fbb6..f8d7db6 100755
--- a/libs/gmp/BUILD
+++ b/libs/gmp/BUILD
@@ -1,6 +1,10 @@
# For use in INSTALL for Bug #16031
persistent_add gmp_old_version &&
-gmp_old_version=$(installed_version ${SPELL}) &&
+if spell_ok ${SPELL}; then
+ gmp_old_version=$(installed_version ${SPELL})
+else
+ gmp_old_version=
+fi &&

# needed by essential /bin/expr at least
OPTS="--libdir=$INSTALL_ROOT/lib $OPTS" &&
diff --git a/libs/gmp/HISTORY b/libs/gmp/HISTORY
index d1fdd48..ca5945e 100644
--- a/libs/gmp/HISTORY
+++ b/libs/gmp/HISTORY
@@ -1,3 +1,6 @@
+2022-11-20 Remko van der Vossen <wich AT sourcemage.org>
+ * BUILD, INSTALL: do not depend on gmp being installed
+
2020-11-15 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: devel version 6.2.1

diff --git a/libs/gmp/INSTALL b/libs/gmp/INSTALL
index fde0f5a..9eea889 100755
--- a/libs/gmp/INSTALL
+++ b/libs/gmp/INSTALL
@@ -2,7 +2,7 @@ default_install &&

# Work around Bug #16031 (libgmp.so.3 -> libgmp.so.10 transition)
# Does not install symlink (removes) on second cast of gmp >= 5.0.1
-if [[ "${gmp_old_version//./}" < '501' ]]; then
+if [[ -n "${gmp_old_version}" && "${gmp_old_version//./}" < '501' ]]; then
message "${MESSAGE_COLOR}Creating temporary /lib/libgmp.so.3 ->
/lib/libgmp.so.10 symlink...${DEFAULT_COLOR}" &&
ln -sf /lib/libgmp.so.10 "${INSTALL_ROOT}"/lib/libgmp.so.3
fi &&



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (a4ead3592860c1a0887bf0c77cd9c99a834e76b9), Remko van der Vossen, 11/20/2022

Archive powered by MHonArc 2.6.24.

Top of Page