Removed amdlibm from aocc, modulefile updated

3 files changed, 32 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56b7f2eba2ce..9896b724a7b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aocc
 	pkgdesc = AMD Optimizing C/C++ Compiler
 	pkgver = 2.0.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://developer.amd.com/amd-aocc/
 	install = aocc.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 0428d25d7da2..25bfea59b05a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Darjan Krijan (daren) <darjan_krijan@gmx.de>
-# Manual download of 'aocc-compiler-${pkgver}.tar' required from upstream
+# Manual download of '${pkgname}-compiler-${pkgver}.tar' required from upstream
 
 pkgname=aocc
 pkgver=2.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="AMD Optimizing C/C++ Compiler"
 arch=('x86_64')
 license=('custom')
@@ -14,19 +14,24 @@ depends=('ncurses5-compat-libs' 'env-modules')
 install=aocc.install
 md5sums=("09d64260794b40901c77504317fbd0ad" "SKIP")
 
-package() {
-	mkdir -p ${pkgdir}/opt/aocc
+aocc_prefix=/opt/aocc
 
-	cp -r ${srcdir}/aocc-compiler-${pkgver}/* ${pkgdir}/opt/aocc
+package() {
+	prefix=${pkgdir}${aocc_prefix}
+	mkdir -p ${prefix}
 
-	# modulefile
-	cp modulefile ${pkgdir}/opt/aocc
-	mkdir -p ${pkgdir}${MODULESHOME}/modulefiles/
-	ln -s /opt/aocc/modulefile ${pkgdir}${MODULESHOME}/modulefiles/aocc
+	# Cleanup
+	rm ${srcdir}/${pkgname}-compiler-${pkgver}/install.sh
+	# amdlibm seems to be an outdated version, use recent one from from aocl
+	find ${srcdir}/${pkgname}-compiler-${pkgver}/lib/ -name "*amdlibm*" -delete
 
-	# Not needed
-	rm ${pkgdir}/opt/aocc/install.sh
+	cp -r ${srcdir}/${pkgname}-compiler-${pkgver}/* ${prefix}
 
 	# aocc symlink
-	ln -s /opt/aocc/bin/clang ${pkgdir}/opt/aocc/bin/aocc
+	ln -s ${aocc_prefix}/bin/clang ${prefix}/bin/${pkgname}
+
+	# modulefile
+	cp ${srcdir}/modulefile ${prefix}
+	mkdir -p ${pkgdir}${MODULESHOME}/modulefiles/
+	ln -s ${aocc_prefix}/modulefile ${pkgdir}${MODULESHOME}/modulefiles/${pkgname}
 }
diff --git a/modulefile b/modulefile
index 6e9139a8b140..a898bebb51c1 100644
--- a/modulefile
+++ b/modulefile
@@ -3,17 +3,20 @@
 # Created by Darjan Krijan <darjan_krijan@gmx.de>
 #
 
-set MODULE      "aocc"
-set BASE_DIR    "/opt"
-set VERSION     "2.0.0"
-set AOCC_ROOT   "$BASE_DIR/$MODULE"
-set AOCC_TEXT   "AMD Optimizing C/C++ Compiler"
+set MODULE    "aocc"
+set BASE_DIR  "/opt"
+set VERSION   "2.0.0"
+set AOCC_ROOT "$BASE_DIR/$MODULE"
+set AOCC_TEXT "AMD Optimizing C/C++ Compiler"
 
-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
+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  CPATH           $AOCC_ROOT/include
+
+setenv       CC              aocc
+setenv       CXX             aocc
+setenv       FC              flang
 
 module-whatis "$AOCC_TEXT version $VERSION"
 
@@ -24,6 +27,5 @@ proc ModulesHelp {} {
 	puts stderr "PATH"
 	puts stderr "LIBRARY_PATH"
 	puts stderr "LD_LIBRARY_PATH"
-	puts stderr "C_INCLUDE_PATH"
-	puts stderr "CPLUS_INCLUDE_PATH"
+	puts stderr "CPATH"
 }