diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2020-12-06 14:58:10 +0100 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-17 23:45:04 -0500 |
| commit | 09b8d2a7e510ccfe285ec29dd8a396f98930d9f2 (patch) | |
| tree | 2c26b37a6c256db02e6f2e58ec4eb0bf00eae2ea /system | |
| parent | 221b67b99d0f36f97ecba5b3f226bbe35898023a (diff) | |
| download | slackbuilds-09b8d2a7e510ccfe285ec29dd8a396f98930d9f2.tar.gz | |
system/nvidia-legacy304-driver: 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-legacy304-driver/nvidia-legacy304-driver.SlackBuild | 6 | ||||
| -rw-r--r-- | system/nvidia-legacy304-driver/nvidia-switch | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild index 18fefdaaa8..fe4f0517c1 100644 --- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild +++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild @@ -99,7 +99,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 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ install -m 755 libnvidia-compiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/ @@ -123,7 +122,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/libnvidia-compiler.so.$VERSION $PKG/usr/lib/ install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/ install -m 755 32/libnvidia-ml.so.$VERSION $PKG/usr/lib/ @@ -205,7 +203,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/ @@ -243,8 +241,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|" \ diff --git a/system/nvidia-legacy304-driver/nvidia-switch b/system/nvidia-legacy304-driver/nvidia-switch index 4ac2648e9c..7f718f42e5 100644 --- a/system/nvidia-legacy304-driver/nvidia-switch +++ b/system/nvidia-legacy304-driver/nvidia-switch @@ -48,22 +48,18 @@ save_GL(){ if [ "$1" = "nvidia" ]; then if [ ! -e libGL.so.$GL_VERSION-xorg ]; then mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg - mv libGL.la libGL.la-xorg fi mv libGL.so.$NV_VERSION-nvidia libGL.so.$NV_VERSION ln -sf libGL.so.$NV_VERSION libGL.so.1 ln -sf libGL.so.$NV_VERSION libGL.so - mv libGL.la-nvidia libGL.la fi if [ "$1" = "xorg" ]; then mv libGL.so.$NV_VERSION libGL.so.$NV_VERSION-nvidia - mv libGL.la libGL.la-nvidia if [ -e libGL.so.$GL_VERSION-xorg ]; then mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION ln -sf libGL.so.$GL_VERSION libGL.so.1 ln -sf libGL.so.$GL_VERSION libGL.so - mv libGL.la-xorg libGL.la else echo WARNING: libGL.so.$GL_VERSION is missing. fi |