Switched to env-modules for a more convenient environment setup

1 files changed, 11 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 84e849b890d4..ae06b037df75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,28 +3,30 @@
 
 pkgname=aocc
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="AMD Optimizing C/C++ Compiler"
 arch=('x86_64')
 license=('custom')
 url="https://developer.amd.com/amd-aocc/"
-source=("local://aocc-compiler-${pkgver}.tar")
+source=("local://aocc-compiler-${pkgver}.tar" "local://modulefile")
 options=('staticlibs' '!strip' 'libtool')
+depends=('env-modules')
 install=aocc.install
-md5sums=("09d64260794b40901c77504317fbd0ad")
+md5sums=("09d64260794b40901c77504317fbd0ad" "SKIP")
 
 package() {
 	mkdir -p ${pkgdir}/opt/aocc
 
 	cp -r ${srcdir}/aocc-compiler-${pkgver}/* ${pkgdir}/opt/aocc
 
+	# modulefile
+	cp modulefile ${pkgdir}/opt/aocc
+	mkdir -p ${pkgdir}/etc/modules/modulefiles/
+	ln -s ${pkgdir}/opt/aocc/modulefile ${pkgdir}/etc/modules/modulefiles/aocc
+
+	# Not needed
 	rm ${pkgdir}/opt/aocc/install.sh
 
+	# aocc symlink
 	ln -s /opt/aocc/bin/clang ${pkgdir}/opt/aocc/bin/aocc
-
-	echo "export PATH=/opt/aocc/bin:\$PATH" > ${pkgdir}/opt/aocc/setenv_aocc.sh
-	echo "export LIBRARY_PATH=/opt/aocc/lib:/opt/aocc/lib32:/usr/lib:/usr/lib32:\$LIBRARY_PATH" >> ${pkgdir}/opt/aocc/setenv_aocc.sh
-	echo "export LD_LIBRARY_PATH=/opt/aocc/lib:/opt/aocc/lib32:/usr/lib:/usr/lib32:\$LD_LIBRARY_PATH" >> ${pkgdir}/opt/aocc/setenv_aocc.sh
-	echo "export C_INCLUDE_PATH=\$C_INCLUDE_PATH:/opt/aocc/include" >> ${pkgdir}/opt/aocc/setenv_aocc.sh
-	echo "export CPLUS_INCLUDE_PATH=\$CPLUS_INCLUDE_PATH:/opt/aocc/include" >> ${pkgdir}/opt/aocc/setenv_aocc.sh
 }