[arch-commits] Commit in cuda/trunk (PKGBUILD cuda-findgllib_mk.diff)

[Sven-Hendrik Haase]

    Date: Monday, September 26, 2016 @ 04:58:26
  Author: svenstaro
Revision: 190574

upgpkg: cuda 7.5.18-5

Try to fix FS#50795

Added:
  cuda/trunk/cuda-findgllib_mk.diff
Modified:
  cuda/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   13 ++++++++++---
 cuda-findgllib_mk.diff |   22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-26 04:55:36 UTC (rev 190573)
+++ PKGBUILD	2016-09-26 04:58:26 UTC (rev 190574)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
 pkgname=cuda
 pkgver=7.5.18
-pkgrel=4
+pkgrel=5
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="http://www.nvidia.com/object/cuda_home.html"
@@ -15,10 +15,12 @@
 install=cuda.install
 source=(http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_${pkgver}_linux.run
         cuda.sh
-        cuda.conf)
+        cuda.conf
+        cuda-findgllib_mk.diff)
 md5sums=('4b3bcecf0dfc35928a0898793cf3e4c6'
          '7e5990e03eea90075f5a500e91a0c3d3'
-         '71420ee4e90c65df21c6c5d34373c245')
+         '71420ee4e90c65df21c6c5d34373c245'
+         '6476452a339c12d8ca18b5feb47100cc')
 
 prepare() {
   sh cuda_${pkgver}_linux.run -extract=${srcdir}
@@ -40,6 +42,11 @@
 
   # use python2
   find pkg -name '*.py' | xargs sed -i -e 's|env python|env python2|g' -e 's|bin/python|bin/python2|g'
+
+  # Fix up samples tht use findgllib_mk
+  for f in pkg/samples/*/*/findgllib.mk; do
+    patch $f cuda-findgllib_mk.diff
+  done
 }
 
 package() {

Added: cuda-findgllib_mk.diff
===================================================================
--- cuda-findgllib_mk.diff	                        (rev 0)
+++ cuda-findgllib_mk.diff	2016-09-26 04:58:26 UTC (rev 190574)
@@ -0,0 +1,22 @@
+--- findgllib.mk.dist	2016-05-01 23:04:03.000000000 +1200
++++ findgllib.mk	2016-09-16 13:47:21.100160762 +1200
+@@ -64,6 +64,7 @@
+         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 $$?)
+         SUSE   = $(shell echo $(DISTRO) | grep -i suse        >/dev/null 2>&1; echo $$?)
++        ARCHLX = $(shell echo $(DISTRO) | grep -i arch        >/dev/null 2>&1; echo $$?)
+     ifeq ("$(UBUNTU)","0")
+       ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l)
+         GLPATH := /usr/arm-linux-gnueabihf/lib
+@@ -102,6 +103,11 @@
+       GLPATH    ?= /usr/lib64/nvidia
+       GLLINK    ?= -L/usr/lib64/nvidia
+       DFLT_PATH ?= /usr/lib64
++    endif
++    ifeq ("$(ARCHLX)","0")
++      GLPATH    ?= /usr/lib64/nvidia
++      GLLINK    ?= -L/usr/lib64/nvidia
++      DFLT_PATH ?= /usr/lib64
+     endif
+   
+   # find libGL, libGLU, libXi,