system/nvidia-legacy390-driver: Build fix.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Lenard Spencer 2021-01-29 01:51:31 +00:00 committed by Willy Sudiarto Raharjo
parent 000fed4fd2
commit 0f58f8644b
No known key found for this signature in database
GPG key ID: 3F617144D7238786
2 changed files with 13 additions and 8 deletions

View file

@ -6,9 +6,13 @@ Installing the 32-bit compatibility libraries is available: if desired,
do:
COMPAT32="yes" ./nvidia-legacy390-driver.SlackBuild
If you plan to test this buildscript on current (15.0 EXPERIMENTAL), to
avoid stomping on xorg-serverand libglvnd, do:
CURRENT="yes" ./nvidia-driver.SlackBuild
If you plan to test this buildscript on current/15.0, do:
CURRENT="yes" ./nvidia-legacy390-driver.SlackBuild
This avoids stomping on the libglvnd libraries, plus it forces the
script to use the prebuilt nvidia-installer since it no longer builds
in current. As a consequence, this script may no longer work in a VM.
If you build and install this driver on current WITHOUT using the
CURRENT="yes" flag, it will corrupt both xorg-server AND libglvnd, so

View file

@ -108,9 +108,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Compiling the various open source apps instead of using the precompiled binaries
# Compiling nvidia-installer from source
cd $TMP/nvidia-installer-$VERSION
if [ "$CURRENT" = "no" ]; then
cd $TMP/nvidia-installer-$VERSION
# Let's try to remove the conflicting files and GPU detection
patch -p0 < $CWD/skip_conflict-GPU_detect.patch
@ -127,12 +127,13 @@ cd $TMP/nvidia-installer-$VERSION
install -m 755 _out/Linux_$TARGET/nvidia-installer $PKG/usr/bin/
install -m 644 _out/Linux_$TARGET/nvidia-installer.1.gz $PKG/usr/man/man1/
cd -
cd -
# Now we need to copy the newly patched and compiled nvidia-installer
# to the driver source tree for use
mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
fi
if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"