sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Ismael Luceno (a3c9a7de35f4696753e8c174e40ff036a78452e0)
- 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 (a3c9a7de35f4696753e8c174e40ff036a78452e0)
- Date: Wed, 29 May 2019 00:08:35 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
utils/procps/HISTORY | 3 +++
utils/procps/INSTALL | 11 ++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit a3c9a7de35f4696753e8c174e40ff036a78452e0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
procps: Fix installation on musl-based systems
ldconfig is not available, so override it when calling make install.
diff --git a/utils/procps/HISTORY b/utils/procps/HISTORY
index b558942..082c48e 100644
--- a/utils/procps/HISTORY
+++ b/utils/procps/HISTORY
@@ -1,3 +1,6 @@
+2019-05-28 Ismael Luceno <ismael AT sourcemage.org>
+ * INSTALL: Override ldconfig on non-glibc systems
+
2019-05-14 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD, missing-includes.patch: Fixed build against musl
diff --git a/utils/procps/INSTALL b/utils/procps/INSTALL
index 97924a2..4d4b79b 100755
--- a/utils/procps/INSTALL
+++ b/utils/procps/INSTALL
@@ -1,2 +1,11 @@
+inst_opt=(DESTDIR="$INSTALL_ROOT" XSCPT=)
+case "$HOST" in
+*-gnu)
+ ;;
+*)
+ # Override ldconfig with the true command
+ inst_opt+=(ldconfig=true)
+ ;;
+esac &&
make_normal &&
-make -e XSCPT='' DESTDIR=${INSTALL_ROOT} install
+make -e "${inst_opt[@]}" install
- [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a3c9a7de35f4696753e8c174e40ff036a78452e0), Ismael Luceno, 05/28/2019
Archive powered by MHonArc 2.6.24.