summaryrefslogtreecommitdiffstats
path: root/testing/source/glibc/doinst.sh-glibc-solibs
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-08-04 07:38:34 +0000
committer Eric Hameleers <alien@slackware.com>2018-08-04 21:00:37 +0200
commita5d7f5b9eb10c91891a9fef0821727e856883b81 (patch)
tree0b0ac06d64949ad0229a6b6f9d363e94241b33ca /testing/source/glibc/doinst.sh-glibc-solibs
parent564ec5a0ace4d77efaa63cccd7f542a454022b6d (diff)
downloadcurrent-a5d7f5b9eb10c91891a9fef0821727e856883b81.tar.gz
current-a5d7f5b9eb10c91891a9fef0821727e856883b81.tar.xz
Sat Aug 4 07:38:34 UTC 201820180804073834
a/dbus-1.12.10-x86_64-1.txz: Upgraded. a/kernel-generic-4.14.60-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.60-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.60-x86_64-1.txz: Upgraded. d/kernel-headers-4.14.60-x86-1.txz: Upgraded. d/mercurial-4.7-x86_64-1.txz: Upgraded. d/rust-1.28.0-x86_64-1.txz: Upgraded. k/kernel-source-4.14.60-noarch-1.txz: Upgraded. xap/blueman-2.0.6-x86_64-2.txz: Rebuilt. Allow users in the netdev group to make changes. Thanks to voleg, kgha, and zakame. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/glibc-2.28-x86_64-2.txz: Rebuilt. Fixed compile issues when linking with libpthread. testing/packages/glibc-i18n-2.28-x86_64-2.txz: Rebuilt. testing/packages/glibc-profile-2.28-x86_64-2.txz: Rebuilt. testing/packages/glibc-solibs-2.28-x86_64-2.txz: Rebuilt. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'testing/source/glibc/doinst.sh-glibc-solibs')
-rw-r--r--testing/source/glibc/doinst.sh-glibc-solibs9
1 files changed, 7 insertions, 2 deletions
diff --git a/testing/source/glibc/doinst.sh-glibc-solibs b/testing/source/glibc/doinst.sh-glibc-solibs
index 570f427d7..3d4466043 100644
--- a/testing/source/glibc/doinst.sh-glibc-solibs
+++ b/testing/source/glibc/doinst.sh-glibc-solibs
@@ -84,7 +84,7 @@ if [ -x /sbin/ldconfig -a -d lib/incoming ]; then # swap on the fly
done
)
) 9> run/lock/pkgtools/ldconfig.lock
-else # no ldconfig? Good, it's safe to just jam it on home (and make links below):
+else # no ldconfig? This is a broken situation, but we will do what we can:
( cd lib/incoming
for file in * ; do
cp -a $file ..
@@ -113,7 +113,11 @@ config etc/profile.d/glibc.sh.new
rm -f etc/profile.d/glibc.csh.new
rm -f etc/profile.d/glibc.sh.new
-# In case there's no ldconfig, make the links manually:
+# This block below *should* be dead code, but it's probably safer to leave it
+# here as a fallback. It no longer has complete coverage of all the links
+# that would be needed in /lib${LIBDIRSUFFIX}, but it covers enough that if
+# we did fall back on this the machine would boot until it reached the boot
+# time call to ldconfig, which would then take care of any missing links.
if [ ! -x /sbin/ldconfig ]; then
( cd lib ; rm -rf libnss_nis.so.2 )
( cd lib ; ln -sf libnss_nis-@@VERSION@@.so libnss_nis.so.2 )
@@ -154,3 +158,4 @@ if [ ! -x /sbin/ldconfig ]; then
( cd lib ; rm -rf librt.so.1 )
( cd lib ; ln -sf librt-@@VERSION@@.so librt.so.1 )
fi
+