Skip to Content.
Sympa Menu

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

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 sorcery by Ismael Luceno (fc6c960563f1d77142bb3f897f24fab253cb114c)
  • Date: Tue, 21 May 2019 19:04:30 +0000

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

var/lib/sorcery/modules/build_api/api1 | 2 +-
var/lib/sorcery/modules/build_api/api2 | 3 ++-
var/lib/sorcery/modules/libresurrect | 6 +++---
var/lib/sorcery/modules/libsorcery | 4 ++--
var/lib/sorcery/sustained | 1 +
5 files changed, 9 insertions(+), 7 deletions(-)

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

libsorcery, libresurrect, api[12]: Run ldconfig only for glibc-based
systems

commit 202feeefb42b897bb9286a5a1c003d23edf96583
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

Add musl to sustained

diff --git a/var/lib/sorcery/modules/build_api/api1
b/var/lib/sorcery/modules/build_api/api1
index 02992d3..ad90377 100755
--- a/var/lib/sorcery/modules/build_api/api1
+++ b/var/lib/sorcery/modules/build_api/api1
@@ -238,7 +238,7 @@ real_default_sorcery_post_build() {
gather_docs
devoke_installwatch
init_post_install
- ldconfig
+ case "$HOST" in *-gnu) ldconfig;; esac
# release_saved_libraries
cd /

diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index 3ec9ef4..55250e4 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -386,7 +386,8 @@ real_default_sorcery_install_extras() {
install_desktop_files
gather_docs
init_post_install
- [[ $STAGED_INSTALL == off ]] && ldconfig
+ [[ $STAGED_INSTALL == off ]] &&
+ case "$HOST" in *-gnu) ldconfig;; esac
# release_saved_libraries
cd /

diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index 7c37f76..984f707 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -356,7 +356,7 @@ resurrect_sub() {
resurrect_fail 1
return 1
}
- ldconfig # can never be too careful
+ case "$HOST" in *-gnu) ldconfig;; esac # can never be too careful

# 12) carefully install config files (save old ones too), or fail/rollback
# this is interactive and so we must use iterator
@@ -379,7 +379,7 @@ resurrect_sub() {
resurrect_fail 1
return 1
}
- ldconfig # paranoia paranoia
+ case "$HOST" in *-gnu) ldconfig;; esac # paranoia paranoia

# 13) remove un-replaced files
if [[ $installed == yes ]] && test -e $OLD_INSTALL_LOG ; then
@@ -418,7 +418,7 @@ resurrect_sub() {
}
run_hook POST_RESURRECT post
fi
- ldconfig # can never be too careful
+ case "$HOST" in *-gnu) ldconfig;; esac # can never be too careful
}


diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 6d2b76d..3144340 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -278,7 +278,7 @@ save_libraries() {

done

- ldconfig "$OLD_LIBS"
+ case "$HOST" in *-gnu) ldconfig "$OLD_LIBS";; esac
unlock_file "$SAVED"

if [ -z "$LD_LIBRARY_PATH" ]
@@ -345,7 +345,7 @@ save_binaries() {
##
#---------------------------------------------------------------------
release_saved_libraries() {
- ldconfig
+ case "$HOST" in *-gnu) ldconfig;; esac
}


diff --git a/var/lib/sorcery/sustained b/var/lib/sorcery/sustained
index ab4036d..05b79bd 100755
--- a/var/lib/sorcery/sustained
+++ b/var/lib/sorcery/sustained
@@ -28,6 +28,7 @@ locale
make
module-init-tools
mpfr
+musl
nano
ncurses
net-tools



  • [SM-Commit] GIT changes to master sorcery by Ismael Luceno (fc6c960563f1d77142bb3f897f24fab253cb114c), Ismael Luceno, 05/21/2019

Archive powered by MHonArc 2.6.24.

Top of Page