diff options
| author |   Eric Hameleers <alien@slackware.com> | 2021-02-03 21:51:39 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-02-03 21:51:39 +0000 |
| commit | 310e57bfdbd0c5fd6ffab56009f4b20aadfda884 (patch) | |
| tree | 58aea081f5b963040496605676f71eb2748d3338 | |
| parent | b4750b019282ef6b7aa776c998a50923cf5cac6d (diff) | |
| download | multilib-310e57bfdbd0c5fd6ffab56009f4b20aadfda884.tar.gz multilib-310e57bfdbd0c5fd6ffab56009f4b20aadfda884.tar.xz | |
glibc-multilib: renamed glibc-solibs to aaaa_glibc-solibs
| -rwxr-xr-x | source/current/glibc/glibc-multilib.SlackBuild | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/current/glibc/glibc-multilib.SlackBuild b/source/current/glibc/glibc-multilib.SlackBuild index e0a932f..6d88f41 100755 --- a/source/current/glibc/glibc-multilib.SlackBuild +++ b/source/current/glibc/glibc-multilib.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glibc VERSION=${VERSION:-2.32} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-1alien} +BUILD=${BUILD:-2alien} # I was considering disabling NSCD, but MoZes talked me out of it. :) #DISABLE_NSCD=" --disable-nscd " @@ -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 "glibc-solibs-${VERSION}_multilib-$ARCH-$BUILD.txz" + echo "aaaa_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-glibc-solibs +PSOLIBS=$TMP/package-aaaa_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 -# glibc-solibs: +# aaaa_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.glibc-solibs > install/slack-desc -cat $CWD/doinst.sh-glibc-solibs > install/doinst.sh +cat $CWD/slack-desc.aaaa_glibc-solibs > install/slack-desc +cat $CWD/doinst.sh-aaaa_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/glibc-solibs-${VERSION}_multilib-$SLACKWARE_ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/aaaa_glibc-solibs-${VERSION}_multilib-$SLACKWARE_ARCH-$BUILD.txz # And finally, the complete "all-in-one" glibc package is created # from whatever was leftover: |