aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2020-12-06 14:50:58 +0100
committerMatteo Bernardini <ponce@slackbuilds.org>2021-04-18 12:22:54 +0200
commit6c54f82a04356711b0402ac6391fe2a67a2a6727 (patch)
tree8aa7ff1da8c57742bbc69c2a5c081f23847c4ef8 /system
parent6fe8f179e0213a7262a4691f3151ce7e393fa068 (diff)
system/nvidia-legacy340-driver: Use libtirpc, no libGL.la.
Fix for gcc >= 10.x Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild8
1 files changed, 2 insertions, 6 deletions
diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
index 543b3e65167f..e4dd4bf1dac6 100644
--- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
+++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
@@ -76,7 +76,6 @@ install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/
install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION-nvidia
install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.$VERSION-nvidia
-install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
install -m 755 libEGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so.$VERSION-nvidia
install -m 755 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
@@ -104,7 +103,6 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
install -m 755 32/libcuda.so.$VERSION $PKG/usr/lib/
install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/libGL.so.$VERSION-nvidia
- install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia
install -m 755 32/libEGL.so.$VERSION $PKG/usr/lib/libEGL.so.$VERSION-nvidia
install -m 755 32/libnvcuvid.so.$VERSION $PKG/usr/lib/
install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/
@@ -182,7 +180,7 @@ cd $TMP/nvidia-settings-$VERSION
make
cd ../../
- CFLAGS="$SLKCFLAGS" \
+ CFLAGS="$SLKCFLAGS -fcommon" \
make
install -m 755 src/_out/Linux_$TARGET/nvidia-settings $PKG/usr/bin/
@@ -234,7 +232,7 @@ cd -
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
- CFLAGS="$SLKCFLAGS" make
+ CFLAGS="$SLKCFLAGS -I/usr/include/tirpc -Wl,-ltirpc" make
#FIXME: need rc.nvidia-persistenced script
install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/
install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
@@ -253,8 +251,6 @@ else
fi
# These update placeholders and correct wrong paths
-sed -i "s|__LIBGL_PATH__|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
-sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
sed -i "s|__UTILS_PATH__|/usr/bin|" \
$PKG/usr/share/applications/nvidia-settings.desktop
sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" \