summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarjan Krijan2019-10-02 09:10:00 +0200
committerDarjan Krijan2019-10-02 09:10:00 +0200
commite4a8d79f6b773564861d9a14a2cb22db4bb08403 (patch)
tree4794180479a0ef8a549886aa79c0d4b466cec858
parent64d37bc18dc2d7cda4a97658f5c507d049435d57 (diff)
downloadaur-e4a8d79f6b773564861d9a14a2cb22db4bb08403.tar.gz
Added ncurses5-compat-libs as dependency for libtinfo.so.5, adapted modulefile
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD6
-rw-r--r--modulefile20
3 files changed, 14 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7efd351d7ed2..d79aa308942d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,6 +6,7 @@ pkgbase = aocc
install = aocc.install
arch = x86_64
license = custom
+ depends = ncurses5-compat-libs
depends = env-modules
options = staticlibs
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 82fd2ddc8b30..b47110475bd9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ license=('custom')
url="https://developer.amd.com/amd-aocc/"
source=("local://aocc-compiler-${pkgver}.tar" "local://modulefile")
options=('staticlibs' '!strip' 'libtool')
-depends=('env-modules')
+depends=('ncurses5-compat-libs' 'env-modules')
install=aocc.install
md5sums=("09d64260794b40901c77504317fbd0ad" "SKIP")
@@ -21,8 +21,8 @@ package() {
# modulefile
cp modulefile ${pkgdir}/opt/aocc
- mkdir -p ${pkgdir}/etc/modules/modulefiles/
- ln -s /opt/aocc/modulefile ${pkgdir}/etc/modules/modulefiles/aocc
+ mkdir -p ${pkgdir}${MODULESHOME}/modulefiles/
+ ln -s /opt/aocc/modulefile ${pkgdir}${MODULESHOME}/modulefiles/aocc
# Not needed
rm ${pkgdir}/opt/aocc/install.sh
diff --git a/modulefile b/modulefile
index 6b6a884fbde0..6e9139a8b140 100644
--- a/modulefile
+++ b/modulefile
@@ -6,20 +6,20 @@
set MODULE "aocc"
set BASE_DIR "/opt"
set VERSION "2.0.0"
-set MODULE_ROOT "$BASE_DIR/$MODULE"
-set MODULE_TEXT "AMD Optimizing C/C++ Compiler"
+set AOCC_ROOT "$BASE_DIR/$MODULE"
+set AOCC_TEXT "AMD Optimizing C/C++ Compiler"
-prepend-path PATH $MODULE_ROOT/bin
-prepend-path LIBRARY_PATH $MODULE_ROOT/lib:$MODULE_ROOT/lib32:/usr/lib:/usr/lib32
-prepend-path LD_LIBRARY_PATH $MODULE_ROOT/lib:$MODULE_ROOT/lib32:/usr/lib:/usr/lib32
-append-path C_INCLUDE_PATH $MODULE_ROOT/include
-append-path CPLUS_INCLUDE_PATH $MODULE_ROOT/include
+prepend-path PATH $AOCC_ROOT/bin
+prepend-path LIBRARY_PATH $AOCC_ROOT/lib:$AOCC_ROOT/lib32:/usr/lib:/usr/lib32
+prepend-path LD_LIBRARY_PATH $AOCC_ROOT/lib:$AOCC_ROOT/lib32:/usr/lib:/usr/lib32
+append-path C_INCLUDE_PATH $AOCC_ROOT/include
+append-path CPLUS_INCLUDE_PATH $AOCC_ROOT/include
-module-whatis "$MODULE_TEXT version $VERSION"
+module-whatis "$AOCC_TEXT version $VERSION"
proc ModulesHelp {} {
- global MODULE_TEXT
- puts stderr "This module sets up the environment for $MODULE_TEXT"
+ global AOCC_TEXT
+ puts stderr "This module sets up the environment for $AOCC_TEXT"
puts stderr "by adapting the following environment variables:"
puts stderr "PATH"
puts stderr "LIBRARY_PATH"