From 952385b3db5f6e2d95234fc17b7477dd1241f56b Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Mon, 8 Feb 2021 07:59:37 +0000 Subject: glibc-multilib: it's not aaaa_glibc-solibs but aaa_glibc-solibs now --- source/current/glibc/glibc-multilib.SlackBuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/current/glibc/glibc-multilib.SlackBuild b/source/current/glibc/glibc-multilib.SlackBuild index 6d88f41..9726f95 100755 --- a/source/current/glibc/glibc-multilib.SlackBuild +++ b/source/current/glibc/glibc-multilib.SlackBuild @@ -53,7 +53,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "glibc-${VERSION}_multilib-$ARCH-$BUILD.txz" echo "glibc-i18n-${VERSION}_multilib-$ARCH-$BUILD.txz" echo "glibc-profile-${VERSION}_multilib-$ARCH-$BUILD.txz" - echo "aaaa_glibc-solibs-${VERSION}_multilib-$ARCH-$BUILD.txz" + echo "aaa_glibc-solibs-${VERSION}_multilib-$ARCH-$BUILD.txz" exit 0 fi @@ -183,7 +183,7 @@ apply_patches() { # This is going to be the initial $DESTDIR: export PKG=$TMP/package-glibc-incoming-tree PGLIBC=$TMP/package-glibc -PSOLIBS=$TMP/package-aaaa_glibc-solibs +PSOLIBS=$TMP/package-aaa_glibc-solibs PI18N=$TMP/package-glibc-i18n PPROFILE=$TMP/package-glibc-profile PDEBUG=$TMP/package-glibc-debug @@ -465,7 +465,7 @@ mkdir install cat $CWD/slack-desc.glibc-i18n > install/slack-desc /sbin/makepkg -l y -c n $TMP/glibc-i18n-${VERSION}_multilib-$SLACKWARE_ARCH-$BUILD.txz -# aaaa_glibc-solibs: +# aaa_glibc-solibs: cd $PSOLIBS mkdir -p etc/profile.d cp -a $CWD/profile.d/* etc/profile.d @@ -505,8 +505,8 @@ mv sbin/ldconfig . rm sbin/* mv ldconfig sbin mkdir install -cat $CWD/slack-desc.aaaa_glibc-solibs > install/slack-desc -cat $CWD/doinst.sh-aaaa_glibc-solibs > install/doinst.sh +cat $CWD/slack-desc.aaa_glibc-solibs > install/slack-desc +cat $CWD/doinst.sh-aaa_glibc-solibs > install/doinst.sh # Fix specific versioning for the symlink creation script. This part of the # script would only be used in the case where there is no ldconfig on the # running system that's used to install the package. That should never be the @@ -522,7 +522,7 @@ if [ "x$LIBDIRSUFFIX" = "x64" ]; then find lib -type l -exec rm {} \; fi # Build the package: -/sbin/makepkg -l y -c n $TMP/aaaa_glibc-solibs-${VERSION}_multilib-$SLACKWARE_ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/aaa_glibc-solibs-${VERSION}_multilib-$SLACKWARE_ARCH-$BUILD.txz # And finally, the complete "all-in-one" glibc package is created # from whatever was leftover: -- cgit v1.2.3-65-gdbad