diff options
| author |   Heinz Wiesinger | 2021-07-04 16:00:00 +0200 |
|---|---|---|
| committer | Heinz Wiesinger | 2021-07-17 21:55:21 +0200 |
| commit | e36b79380591ae50025161e115a44da5be8a8458 (patch) | |
| tree | b356d141d1840ff32c55758e653c270a7db3bfbf /system | |
| parent | 3f2b0245ad1dc3d938322780aabd1d3dee17a6c3 (diff) | |
| download | slackbuilds-e36b79380591ae50025161e115a44da5be8a8458.tar.gz | |
system/nvidia-legacy390-driver: Fix support for PRINT_PACKAGE_NAME
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
Diffstat (limited to 'system')
| -rw-r--r-- | system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild index 13a3ddc046..1a79768f7b 100644 --- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild +++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild @@ -43,18 +43,6 @@ if [ -z "$ARCH" ]; then esac 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" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" TARGET="x86" @@ -77,6 +65,30 @@ else COMPAT32=no fi +if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then + COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr" + MULTI="_multilib" +else + if [ ! "$ARCH" = "x86_64" ]; then + COMP32="" + else + COMP32="--no-install-compat32-libs" + MULTI="" + fi +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$MULTI-$TARGET-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + # Abort if an Nvidia driver is still installed: if [ -x /usr/bin/nvidia-installer ]; then echo -e "\n A previous Nvidia installation has been detected!" @@ -146,16 +158,7 @@ mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr" - MULTI="_multilib" - mkdir $PKG/usr/lib -else - if [ ! "$ARCH" = "x86_64" ]; then - COMP32="" - else - COMP32="--no-install-compat32-libs" - MULTI="" - fi + mkdir $PKG/usr/lib fi # Install the binary libs using nvidia-installer compiled above |