Only use the new "gl32" location from now on, drop old guy

Signed-off-by: Ikey Doherty <ikey@solus-project.com>
This commit is contained in:
Ikey Doherty
2017-11-13 03:46:24 +00:00
parent e81f379882
commit 80603598af
2 changed files with 3 additions and 5 deletions
+3 -3
View File
@@ -53,8 +53,8 @@ static const char *libgl_target_table[] = {
"/var/lib/snapd/lib/gl/libEGL.so.1",
#else
/* 32bit support */
"/var/lib/snapd/lib/gl/32/libGL.so.1",
"/var/lib/snapd/lib/gl/32/libEGL.so.1",
"/var/lib/snapd/lib/gl32/libGL.so.1",
"/var/lib/snapd/lib/gl32/libEGL.so.1",
#endif
};
@@ -124,7 +124,7 @@ bool lsi_override_snapd_nvidia(const char *name, const char **soname)
nvidia_target_dir = "/var/lib/snapd/lib/gl";
#else
/* 32-bit libdir */
nvidia_target_dir = "/var/lib/snapd/lib/gl/32";
nvidia_target_dir = "/var/lib/snapd/lib/gl32";
#endif
/* Grab the link name */
-2
View File
@@ -202,12 +202,10 @@ static void shim_export_extra(const char *prefix)
*/
static const char *ld_library_dirs[] = {
"/var/lib/snapd/lib/gl/vdpau", /**<64-bit vdpau */
"/var/lib/snapd/lib/gl/32/vdpau", /**<32bit vdpau */
"/var/lib/snapd/lib/gl32/vdpau", /**<32bit vdpau */
"/usr/lib/glx-provider/default", /**<Solus mesa, 64-bit */
"/usr/lib32/glx-provider/default", /**<Solus mesa, 32bit */
"/var/lib/snapd/lib/gl", /**<Potential host NVIDIA libraries */
"/var/lib/snapd/lib/gl/32", /**<Potential host NVIDIA 32-bit libraries (old location) */
"/var/lib/snapd/lib/gl32", /**<Potential host NVIDIA 32-bit libraries (new location) */
};