Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (ca92a5b895ac9635281aeb8b82c7bbfb0099e701)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (ca92a5b895ac9635281aeb8b82c7bbfb0099e701)
  • Date: Tue, 15 Aug 2017 22:45:36 +0000

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

libs/gmp/BUILD | 4 ++++
libs/gmp/HISTORY | 3 +++
libs/gmp/INSTALL | 16 +++++++++-------
3 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit ca92a5b895ac9635281aeb8b82c7bbfb0099e701
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gmp: Need libgmp.so.3 symlink during transisiont from 4.3.2 (Bug #16031)

diff --git a/libs/gmp/BUILD b/libs/gmp/BUILD
index eee32e6..063fbb6 100755
--- a/libs/gmp/BUILD
+++ b/libs/gmp/BUILD
@@ -1,3 +1,7 @@
+# For use in INSTALL for Bug #16031
+persistent_add gmp_old_version &&
+gmp_old_version=$(installed_version ${SPELL}) &&
+
# needed by essential /bin/expr at least
OPTS="--libdir=$INSTALL_ROOT/lib $OPTS" &&
# gcc bug when running test?
diff --git a/libs/gmp/HISTORY b/libs/gmp/HISTORY
index 7efb8c8..0b66199 100644
--- a/libs/gmp/HISTORY
+++ b/libs/gmp/HISTORY
@@ -1,3 +1,6 @@
+2017-08-14 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD, INSTALL: Need libgmp.so.3 symlink during transisiont from
4.3.2 (Bug #16031)
+
2017-08-10 Thomas Orgis <sobukus AT sourcemage.org>
* UP_TRIGGERS: Trying to handle the ABI breakage of 5.0.1.

diff --git a/libs/gmp/INSTALL b/libs/gmp/INSTALL
index a37b883f..fde0f5a 100755
--- a/libs/gmp/INSTALL
+++ b/libs/gmp/INSTALL
@@ -1,8 +1,10 @@
-# necessary because otherwise gcc becomes unusable after switching
-# from/to devel version
-if [[ $GMP_DEVEL == "n" ]]; then
- ln -sf /lib/libgmp.so.3 ${INSTALL_ROOT}/lib/libgmp.so.10
-else
- ln -sf /lib/libgmp.so.10 ${INSTALL_ROOT}/lib/libgmp.so.3
+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
+ 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 &&
-default_install
+
+persistent_remove gmp_old_version



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (ca92a5b895ac9635281aeb8b82c7bbfb0099e701), Eric Sandall, 08/16/2017

Archive powered by MHonArc 2.6.24.

Top of Page