summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarjan Krijan2022-04-29 10:10:26 +0200
committerDarjan Krijan2022-04-29 10:10:26 +0200
commit671cbba3a2756e7aecd859a7641ab843152a92fc (patch)
tree4ab45e5b6f28a6fe51930de1637e53edfbc4676a
parentd2d11793792794dd74df090e78f517cbcefd136d (diff)
downloadaur-671cbba3a2756e7aecd859a7641ab843152a92fc.tar.gz
Added AOCL_ROOT to env variables in modulefile, some examples need it. Removed pkgver from aocl-libs.cfg in install directory.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
-rw-r--r--modulefile3
3 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f081040ffed7..9061da1e5e95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = aocl
pkgdesc = AMD Optimizing CPU Libraries
pkgver = 3.1.0
- pkgrel = 1
+ pkgrel = 2
url = https://developer.amd.com/amd-aocl/
arch = x86_64
license = custom
diff --git a/PKGBUILD b/PKGBUILD
index 9e9ddc702217..d4975e936f88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
-# Maintainer: Darjan Krijan (daren) <darjan_krijan@gmx.de>
+# Maintainer: Darjan Krijan (daren) <${prename}_${surname}@gmx.de>
# Manual download of 'aocl-linux-aocc-${pkgver}.tar.gz' required from upstream
# Manual download of 'aocl-linux-gcc-${pkgver}.tar.gz' required from upstream
pkgbase=aocl
pkgname=(aocl-aocc aocl-gcc)
pkgver=3.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="AMD Optimizing CPU Libraries"
arch=('x86_64')
license=('custom')
@@ -72,8 +72,8 @@ package_aocl-gcc() {
mv ${prefix}/${pkgver}/* ${prefix}
rm -r ${prefix}/${pkgver}
- # fix amd-libs.cfg containing ${pkgdir}
- sed -e "s:=.*/opt:=/opt:g" -i ${prefix}/amd-libs.cfg
+ # fix amd-libs.cfg containing ${pkgdir} and ${pkgver}
+ sed -e "s:=.*/opt:=/opt:g" -e "s:/${pkgver}::g" -i ${prefix}/amd-libs.cfg
# env-modules (optional)
cp ${srcdir}/modulefile ${prefix}
diff --git a/modulefile b/modulefile
index a110e829ef01..0603fb8ad503 100644
--- a/modulefile
+++ b/modulefile
@@ -1,6 +1,6 @@
#%Module1.0
#
-# Created by Darjan Krijan <darjan_krijan@gmx.de>
+# Created by Darjan Krijan <${prename}_${surname}@gmx.de>
#
set MODULE "aocl-aocc"
@@ -11,6 +11,7 @@ set MODULE_TEXT "AMD Optimizing CPU Libraries (AOCL)"
conflict aocl-gcc
+setenv AOCL_ROOT ${MODULE_ROOT}
prepend-path CPATH ${MODULE_ROOT}/include
prepend-path LIBRARY_PATH ${MODULE_ROOT}/lib
prepend-path LD_LIBRARY_PATH ${MODULE_ROOT}/lib