From 0752e654b1ab585ca6f8983fd0e6772843a6e6cc Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Thu, 2 May 2019 15:46:23 +0200
Subject: [PATCH] nvidia_current: Install all libs

Find libraries to be installed by pattern instead of using a explicit
list empedded in the bee file.

Install libraries with the original names and create symlink from the soname
if there is one.

We don't need to look into other diretories (tls/) because all libraries
are now in the main directory of the archive.

We no longer need to special case libglx.so, because we install every
library by its original name anyway.
---
 nvidia_current-418.56-0.bee | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/nvidia_current-418.56-0.bee b/nvidia_current-418.56-0.bee
index 73cc2476e..639d3aa61 100755
--- a/nvidia_current-418.56-0.bee
+++ b/nvidia_current-418.56-0.bee
@@ -40,26 +40,6 @@ mee_install() {
 
     mkdir -pv ${D}${PREFIX}/{bin,lib,drivers,share}
 
-    NVLIBS=(
-        "libGL.so.${PKGVERSION}"
-        "libOpenCL.so.1.0.0"
-        "libcuda.so.${PKGVERSION}"
-        "libnvcuvid.so.${PKGVERSION}"
-        "libnvidia-cfg.so.${PKGVERSION}"
-        "libnvidia-compiler.so.${PKGVERSION}"
-        "libnvidia-encode.so.${PKGVERSION}"
-        "libnvidia-glcore.so.${PKGVERSION}"
-        "libnvidia-ml.so.${PKGVERSION}"
-        "libnvidia-opencl.so.${PKGVERSION}"
-        "libnvidia-ptxjitcompiler.so.${PKGVERSION}"
-        "tls/libnvidia-tls.so.${PKGVERSION}"
-        "libnvidia-wfb.so.${PKGVERSION}"
-        "libvdpau_nvidia.so.${PKGVERSION}"
-        libnvidia-gtk2.so.${PKGVERSION}
-        libnvidia-gtk3.so.${PKGVERSION}
-        libnvidia-fatbinaryloader.so.${PKGVERSION}
-    )
-
     NVDRV="nvidia_drv.so"
 
     NVBIN=( \
@@ -69,18 +49,16 @@ mee_install() {
         "nvidia-modprobe" \
     )
 
-    for i in ${NVLIBS[@]} ; do
-        soname=$(soname ${i} || echo "ERROR")
-        echo "installing ${i} as lib/${soname}"
-        install -v -c ${i} ${D}${LIBDIR}/${soname}
+    for i in lib*.so.$PKGVERSION; do
+        install -v -t ${D}${LIBDIR} "$i"
+        if soname="$(soname "$i")"; then
+            test -e "${D}${LIBDIR}/${soname}" || ln -sv "$i"  "${D}${LIBDIR}/${soname}"
+        fi
     done
 
     echo "installing ${NVDRV} as drivers/$(basename ${NVDRV})";
     install -c -v ${NVDRV} ${D}${PREFIX}/drivers
 
-    # soname is missing in this release..
-    install -c -v "libglx.so.${PKGVERSION}" ${D}${LIBDIR}/libglx.so
-
     mkdir -pv ${D}/usr/share/man/man1
 
     for i in ${NVBIN[@]} ; do