diff options
| author | Heinz Wiesinger <pprkut@slackbuilds.org> | 2021-07-04 15:59:49 +0200 |
|---|---|---|
| committer | Heinz Wiesinger <pprkut@slackbuilds.org> | 2021-07-17 21:55:13 +0200 |
| commit | 947ee3ee1d579256f79ca7406945a7b82555ec3e (patch) | |
| tree | b54adf4421be21cb80d60b59b75c9ac2b15ffd1e /development | |
| parent | f8da624fe7328c37f30fa4acc37094e4d41a4a41 (diff) | |
| download | slackbuilds-947ee3ee1d579256f79ca7406945a7b82555ec3e.tar.gz | |
development/gcc5: Fix support for PRINT_PACKAGE_NAME
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
Diffstat (limited to 'development')
| -rw-r--r-- | development/gcc5/gcc5.SlackBuild | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/development/gcc5/gcc5.SlackBuild b/development/gcc5/gcc5.SlackBuild index 452d839d2c..f8181187cb 100644 --- a/development/gcc5/gcc5.SlackBuild +++ b/development/gcc5/gcc5.SlackBuild @@ -73,11 +73,29 @@ if [ -z "$ARCH" ]; then export ARCH fi +if [ "$ARCH" = "x86_64" ]; then + if [ -f /usr/lib/libc.a ]; then + # If we find a 32bit C library on 64bit Slackware, assume multilib: + GCC_ARCHOPTS="--enable-multilib" + MULTILIB="YES" + else + GCC_ARCHOPTS="--disable-multilib" + MULTILIB="NO" + fi +else + GCC_ARCHOPTS="--with-arch=$ARCH" + MULTILIB="NO" +fi + # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information # could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + if [ ${MULTILIB} = "YES" ]; then + echo "$PRGNAM-${VERSION}_multilib-$ARCH-$BUILD$TAG.$PKGTYPE" + else + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + fi exit 0 fi @@ -137,20 +155,6 @@ case "$ARCH" in *) TARGET=$ARCH-slackware-linux ;; esac -if [ "$ARCH" = "x86_64" ]; then - if [ -f /usr/lib/libc.a ]; then - # If we find a 32bit C library on 64bit Slackware, assume multilib: - GCC_ARCHOPTS="--enable-multilib" - MULTILIB="YES" - else - GCC_ARCHOPTS="--disable-multilib" - MULTILIB="NO" - fi -else - GCC_ARCHOPTS="--with-arch=$ARCH" - MULTILIB="NO" -fi - # Clear the build locations: rm -fr $TMP/fastjar-* $TMP/gcc-$VERSION $TMP/gcc.build.lnx $TMP/gcc.build.log $TMP/package-$PRGNAM |