Switched to env-modules for a more convenient environment setup

4 files changed, 50 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03af14e47967..7efd351d7ed2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,19 @@
 pkgbase = aocc
 	pkgdesc = AMD Optimizing C/C++ Compiler
 	pkgver = 2.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://developer.amd.com/amd-aocc/
 	install = aocc.install
 	arch = x86_64
 	license = custom
+	depends = env-modules
 	options = staticlibs
 	options = !strip
 	options = libtool
 	source = local://aocc-compiler-2.0.0.tar
+	source = local://modulefile
 	md5sums = 09d64260794b40901c77504317fbd0ad
+	md5sums = SKIP
 
 pkgname = aocc
 
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
 }
diff --git a/aocc.install b/aocc.install
index a7d9a19da474..83260b6f6af0 100644
--- a/aocc.install
+++ b/aocc.install
@@ -1,8 +1,7 @@
 post_install() {
-	echo "Add the following function to your .bashrc and use it to set up aocc."
-	echo ""
-	echo "# AMD Optimizing C/C++ Compiler"
-	echo "setenv_aocc() {"
-	echo -e "\tsource /opt/aocc/setenv_aocc.sh"
-	echo "}"
+	echo "Use 'module load aocc' to set up the environment for AMD Optimizing C/C++ Compiler."
+}
+
+post_upgrade() {
+	post_install
 }
diff --git a/modulefile b/modulefile
new file mode 100644
index 000000000000..61f8270095b2
--- /dev/null
+++ b/modulefile
@@ -0,0 +1,30 @@
+#%Module1.0
+#
+# Created by Darjan Krijan <darjan_krijan@gmx.de>
+#
+
+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"
+
+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
+
+module-whatis	"$MODULE_TEXT version $VERSION"
+
+proc ModulesHelp {} {
+	global MODULE_TEXT
+	puts stderr "This module sets up the environment for $MODULE_TEXT"
+	puts stderr "by adapting the following environment variables:"
+	puts stderr "PATH"
+	puts stderr "LIBRARY_PATH"
+	puts stderr "LD_LIBRARY_PATH"
+	puts stderr "C_INCLUDE_PATH"
+	puts stderr "CPLUS_INCLUDE_PATH"
+}