Hardcoded /etc/modules/modulefiles in PKGBUILD for optional env-modules support even if installed afterwards. Added post_remove() to clean up 'setenv_AOCC.sh' after uninstall. modulefile reorganized and sets aliases.

1 files changed, 5 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 05e6d674f477..3ba28b8ac55e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=aocc
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="AMD Optimizing C/C++ Compiler"
 arch=('x86_64')
 license=('custom')
@@ -19,13 +19,14 @@ md5sums=("e670c7f8abe5a96b7b1d770f5a8e160a" "SKIP")
 # like e.g. "-O3 -march=znver2 -mtune=znver2"
 _default_flags="${CFLAGS}"
 
+# path hardcoded in aocc.install. if you change this, change paths there as well
 _aocc_prefix=/opt/aocc
 
 package() {
 	prefix=${pkgdir}${_aocc_prefix}
 	mkdir -p ${prefix}
 
-	cp -r ${srcdir}/${pkgname}-compiler-${pkgver}/* ${prefix}
+	cp -rp ${srcdir}/${pkgname}-compiler-${pkgver}/* ${prefix}
 
 	ln -s ${_aocc_prefix}/bin/clang   ${prefix}/bin/aocc-clang
 	ln -s ${_aocc_prefix}/bin/clang++ ${prefix}/bin/aocc-clang++
@@ -38,8 +39,6 @@ package() {
 
 	# env-modules (optional)
 	cp ${srcdir}/modulefile ${prefix}
-	if [ -n ${MODULESHOME} ]; then
-		mkdir -p ${pkgdir}${MODULESHOME}/modulefiles/
-		ln -s ${_aocc_prefix}/modulefile ${pkgdir}${MODULESHOME}/modulefiles/${pkgname}
-	fi
+	mkdir -p ${pkgdir}/etc/modules/modulefiles
+	ln -s ${_aocc_prefix}/modulefile ${pkgdir}/etc/modules/modulefiles/${pkgname}
 }