Attachment 10826 Details for Bug 24411 – patch4 for nvidia cuda 10.1 spec file

[patch] patch4 for nvidia cuda 10.1 spec file

findvulkan-fix-mageia.patch (text/plain), 1.25 KB, created by Giuseppe Ghibò on 2019-03-02 15:43:16 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ghibò

Created: 2019-03-02 15:43:16 CET

Size: 1.25 KB

patch

obsolete

>--- findvulkan.mk.orig	2019-02-10 07:32:49.000000000 +0100
>+++ findvulkan.mk	2019-03-02 13:07:08.425255875 +0100
>@@ -55,6 +55,7 @@
> ifeq ("$(TARGET_OS)","linux")
>     # Each set of Linux Distros have different paths for where to find their GLM/GLFW3 libraries reside
>     UBUNTU = $(shell echo $(DISTRO) | grep -i ubuntu      >/dev/null 2>&1; echo $$?)
>+    MAGEIA = $(shell echo $(DISTRO) | grep -i mageia      >/dev/null 2>&1; echo $$?)
>     FEDORA = $(shell echo $(DISTRO) | grep -i fedora      >/dev/null 2>&1; echo $$?)
>     RHEL   = $(shell echo $(DISTRO) | grep -i 'red\|rhel' >/dev/null 2>&1; echo $$?)
>     CENTOS = $(shell echo $(DISTRO) | grep -i centos      >/dev/null 2>&1; echo $$?)
>@@ -90,6 +91,11 @@
>       GLLINK    ?= -L/usr/X11R6/lib64
>       DFLT_PATH ?= /usr/lib64
>     endif
>+    ifeq ("$(MAGEIA)","0")
>+      GLPATH    ?= /usr/lib64
>+      GLLINK    ?= -L/usr/lib64
>+      DFLT_PATH ?= /usr/lib64
>+    endif
>     ifeq ("$(FEDORA)","0")
>       GLPATH    ?= /usr/lib64/nvidia
>       GLLINK    ?= -L/usr/lib64/nvidia
>@@ -106,7 +112,7 @@
>       DFLT_PATH ?= /usr/lib64
>     endif
> 
>-  VULKAN_SDK_PATH ?= ${VULKAN_SDK}
>+  VULKAN_SDK_PATH ?= /usr
> 
>   ifeq ("$(VULKAN_SDK_PATH)","")
>       $(info >>> WARNING - Vulkan SDK not found, please install Vulkan SDK <<<)

--- findvulkan.mk.orig	2019-02-10 07:32:49.000000000 +0100
+++ findvulkan.mk	2019-03-02 13:07:08.425255875 +0100
@@ -55,6 +55,7 @@
 ifeq ("$(TARGET_OS)","linux")
     # Each set of Linux Distros have different paths for where to find their GLM/GLFW3 libraries reside
     UBUNTU = $(shell echo $(DISTRO) | grep -i ubuntu      >/dev/null 2>&1; echo $$?)
+    MAGEIA = $(shell echo $(DISTRO) | grep -i mageia      >/dev/null 2>&1; echo $$?)
     FEDORA = $(shell echo $(DISTRO) | grep -i fedora      >/dev/null 2>&1; echo $$?)
     RHEL   = $(shell echo $(DISTRO) | grep -i 'red\|rhel' >/dev/null 2>&1; echo $$?)
     CENTOS = $(shell echo $(DISTRO) | grep -i centos      >/dev/null 2>&1; echo $$?)
@@ -90,6 +91,11 @@
       GLLINK    ?= -L/usr/X11R6/lib64
       DFLT_PATH ?= /usr/lib64
     endif
+    ifeq ("$(MAGEIA)","0")
+      GLPATH    ?= /usr/lib64
+      GLLINK    ?= -L/usr/lib64
+      DFLT_PATH ?= /usr/lib64
+    endif
     ifeq ("$(FEDORA)","0")
       GLPATH    ?= /usr/lib64/nvidia
       GLLINK    ?= -L/usr/lib64/nvidia
@@ -106,7 +112,7 @@
       DFLT_PATH ?= /usr/lib64
     endif
 
-  VULKAN_SDK_PATH ?= ${VULKAN_SDK}
+  VULKAN_SDK_PATH ?= /usr
 
   ifeq ("$(VULKAN_SDK_PATH)","")
       $(info >>> WARNING - Vulkan SDK not found, please install Vulkan SDK <<<)

Actions: View | Diff

Attachments on bug 24411: 10794 | 10795 | 10796 | 10801 | 10804 | 10805 | 10806 | 10811 | 10812 | 10813 | 10814 | 10815 | 10817 | 10818 | 10819 | 10822 | 10823 | 10824 | 10825 | 10826 | 10827 | 10828 | 10829 | 10831 | 10832 | 10833 | 10835 | 10837 | 10839 | 10869 | 10870 | 10871 | 10872