Update to 3.0-6, env-modules now optional

5 files changed, 56 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 003a99584c4b..438bf36ebdfb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = aocl
 	pkgdesc = AMD Optimizing CPU Libraries
-	pkgver = 2.1
-	pkgrel = 6
+	pkgver = 3.0
+	pkgrel = 1
 	url = https://developer.amd.com/amd-aocl/
 	arch = x86_64
 	license = custom
-	depends = env-modules
+	optdepends = env-modules
 	options = staticlibs
 	options = !strip
-	source = local://aocl-linux-aocc-2.1.tar.gz
-	source = local://aocl-linux-gcc-2.1.tar.gz
+	source = local://aocl-linux-aocc-3.0-6.tar.gz
+	source = local://aocl-linux-gcc-3.0-6.tar.gz
 	source = local://aocl-aocc.install
 	source = local://aocl-gcc.install
 	source = local://modulefile
-	sha256sums = e7af89ca23a545cc8bea54c2cb5005a42bf359611f5d4c28336f78f691da3a23
-	sha256sums = 8ea9ec16051893e480f7ba09babeaa833897586aa4d0c2c53b22132b5884150c
+	sha256sums = c1f0dd73ad0bfb1ede823cdd681c2834f2b7c88b8e7423c4c4412d6cc624ce39
+	sha256sums = 294e63fbceee8d993c4a98d51e008f81ffe4159b5b163db316ddd93fccc04b52
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index ac26fc8ab5d2..7d09b5d66dc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,33 @@
 # Maintainer: Darjan Krijan (daren) <darjan_krijan@gmx.de>
-# Manual download of '${pkgname}-linux-gcc-${pkgver}.tar.gz' required from upstream
-# Manual download of '${pkgname}-linux-aocc-${pkgver}.tar.gz' required from upstream
+# Manual download of '${pkgname}-linux-gcc-${pkgver}-${_pkgrel}.tar.gz'  required from upstream
+# Manual download of '${pkgname}-linux-aocc-${pkgver}-${_pkgrel}.tar.gz' required from upstream
 
 pkgbase=aocl
 pkgname=(aocl-aocc aocl-gcc)
-pkgver=2.1
-pkgrel=6
+pkgver=3.0
+_pkgrel=6
+pkgrel=1
 pkgdesc="AMD Optimizing CPU Libraries"
 arch=('x86_64')
 license=('custom')
 url="https://developer.amd.com/amd-aocl/"
 source=(
-	"local://${pkgbase}-linux-aocc-${pkgver}.tar.gz"
-	"local://${pkgbase}-linux-gcc-${pkgver}.tar.gz"
+	"local://${pkgbase}-linux-aocc-${pkgver}-${_pkgrel}.tar.gz"
+	"local://${pkgbase}-linux-gcc-${pkgver}-${_pkgrel}.tar.gz"
 	"local://${pkgbase}-aocc.install"
 	"local://${pkgbase}-gcc.install"
 	"local://modulefile"
 )
 options=('staticlibs' '!strip')
-depends=('env-modules')
+optdepends=('env-modules')
 sha256sums=(
-	"e7af89ca23a545cc8bea54c2cb5005a42bf359611f5d4c28336f78f691da3a23"
-	"8ea9ec16051893e480f7ba09babeaa833897586aa4d0c2c53b22132b5884150c"
+	"c1f0dd73ad0bfb1ede823cdd681c2834f2b7c88b8e7423c4c4412d6cc624ce39"
+	"294e63fbceee8d993c4a98d51e008f81ffe4159b5b163db316ddd93fccc04b52"
 	"SKIP"
 	"SKIP"
 	"SKIP"
 )
 
-if [ -z ${MODULESHOME} ]; then
-	echo "Environment variable MODULESHOME from env-modules is unset."
-	echo "Restart your shell or source the env-modules scripts for your shell."
-	exit 1
-fi
-
 package_aocl-aocc() {
 	install=${pkgname}.install
 
@@ -40,24 +35,23 @@ package_aocl-aocc() {
 	prefix=${pkgdir}/${aocl_prefix}
 	mkdir -p ${prefix}
 
-	cd ${srcdir}/${pkgbase}-linux-aocc-${pkgver}
+	cd ${srcdir}/${pkgbase}-linux-aocc-${pkgver}-${_pkgrel}
 
 	cp AOCL_User_Guide_${pkgver}.pdf ${prefix}
 
 	./install.sh -t ${prefix}
 
 	# strip unneeded directories
-	mv ${prefix}/amd/${pkgbase}/${pkgver}/* ${prefix}
-	rm -r ${prefix}/amd
+	mv ${prefix}/${pkgver}-${_pkgrel}/* ${prefix}
+	rm -r ${prefix}/${pkgver}-${_pkgrel}
 
-	# delete libs directory with broken symlinks
-	rm -rf ${prefix}/libs
+	# fix amd-libs.cfg containing ${pkgdir}
+	sed -e "s:=.*/opt:=/opt:g" -i ${prefix}/amd-libs.cfg
 
-	# modulefile
-	echo -e "\nSymlinking modulefile..."
+	# env-modules (optional)
 	cp ${srcdir}/modulefile ${prefix}
-	mkdir -p ${pkgdir}${MODULESHOME}/modulefiles/
-	ln -s ${aocl_prefix}/modulefile ${pkgdir}${MODULESHOME}/modulefiles/${pkgname}
+	mkdir -p ${pkgdir}/etc/modules/modulefiles
+	ln -s ${aocl_prefix}/modulefile ${pkgdir}/etc/modules/modulefiles/${pkgname}
 }
 
 package_aocl-gcc() {
@@ -67,27 +61,26 @@ package_aocl-gcc() {
 	prefix=${pkgdir}/${aocl_prefix}
 	mkdir -p ${prefix}
 
-	cd ${srcdir}/${pkgbase}-linux-gcc-${pkgver}
+	cd ${srcdir}/${pkgbase}-linux-gcc-${pkgver}-${_pkgrel}
 
 	cp AOCL_User_Guide_${pkgver}.pdf ${prefix}
 
 	./install.sh -t ${prefix}
 
 	# strip unneeded directories
-	mv ${prefix}/amd/${pkgbase}/${pkgver}/* ${prefix}
-	rm -r ${prefix}/amd
+	mv ${prefix}/${pkgver}-${_pkgrel}/* ${prefix}
+	rm -r ${prefix}/${pkgver}-${_pkgrel}
 
-	# delete libs directory with broken symlinks
-	rm -rf ${prefix}/libs
+	# fix amd-libs.cfg containing ${pkgdir}
+	sed -e "s:=.*/opt:=/opt:g" -i ${prefix}/amd-libs.cfg
 
-	# modulefile
-	echo -e "\nSymlinking modulefile..."
+	# env-modules (optional)
 	cp ${srcdir}/modulefile ${prefix}
 	sed -e "s/aocl-aocc/aocl-gcc/g" \
 		-e "s/conflict aocl-gcc/conflict aocl-aocc/g" \
 		-i ${prefix}/modulefile
-	mkdir -p ${pkgdir}${MODULESHOME}/modulefiles/
-	ln -s ${aocl_prefix}/modulefile ${pkgdir}${MODULESHOME}/modulefiles/${pkgname}
+	mkdir -p ${pkgdir}/etc/modules/modulefiles
+	ln -s ${aocl_prefix}/modulefile ${pkgdir}/etc/modules/modulefiles/${pkgname}
 }
 
 # vim:set ts=4
diff --git a/aocl-aocc.install b/aocl-aocc.install
index 0aa6fed53990..9117229fc8d3 100644
--- a/aocl-aocc.install
+++ b/aocl-aocc.install
@@ -1,5 +1,10 @@
 post_install() {
-	echo "Use 'module load aocl-aocc' to set up the environment for AMD Optimizing CPU Libraries."
+	if pacman -Q env-modules &> /dev/null; then
+		echo "env-modules seems to be installed:"
+		echo "If configured correctly, you can conveniently use"
+		echo "  $ module load aocl-aocc"
+		echo "to set up the environment for AMD Optimizing CPU Libraries."
+	fi
 }
 
 post_upgrade() {
diff --git a/aocl-gcc.install b/aocl-gcc.install
index 46d79afc7785..ce5339dca828 100644
--- a/aocl-gcc.install
+++ b/aocl-gcc.install
@@ -1,5 +1,10 @@
 post_install() {
-	echo "Use 'module load aocl-gcc' to set up the environment for AMD Optimizing CPU Libraries."
+	if pacman -Q env-modules &> /dev/null; then
+		echo "env-modules seems to be installed:"
+		echo "If configured correctly, you can conveniently use"
+		echo "  $ module load aocl-gcc"
+		echo "to set up the environment for AMD Optimizing CPU Libraries."
+	fi
 }
 
 post_upgrade() {
diff --git a/modulefile b/modulefile
index e6e3e2a3df4b..19970f5bc3dc 100644
--- a/modulefile
+++ b/modulefile
@@ -3,40 +3,23 @@
 # Created by Darjan Krijan <darjan_krijan@gmx.de>
 #
 
-set MODULE    "aocl-aocc"
-set BASE_DIR  "/opt"
-set VERSION   "2.1"
-set AOCL_ROOT "${BASE_DIR}/${MODULE}"
-set AOCL_TEXT "AMD Optimizing CPU Libraries (AOCL)"
+set MODULE      "aocl-aocc"
+set BASE_DIR    "/opt"
+set VERSION     "3.0-6"
+set MODULE_ROOT "${BASE_DIR}/${MODULE}"
+set MODULE_TEXT "AMD Optimizing CPU Libraries (AOCL)"
 
 conflict aocl-gcc
 
-prepend-path CPATH           ${AOCL_ROOT}/amd-securerng/include
-prepend-path CPATH           ${AOCL_ROOT}/amd-rng/rng/include
-prepend-path CPATH           ${AOCL_ROOT}/amd-libm/include
-prepend-path CPATH           ${AOCL_ROOT}/amd-libflame/include
-prepend-path CPATH           ${AOCL_ROOT}/amd-fftw/include
-prepend-path CPATH           ${AOCL_ROOT}/amd-blis/include
-prepend-path LIBRARY_PATH    ${AOCL_ROOT}/amd-securerng/lib
-prepend-path LIBRARY_PATH    ${AOCL_ROOT}/amd-scalapack/lib
-prepend-path LIBRARY_PATH    ${AOCL_ROOT}/amd-rng/rng/lib
-prepend-path LIBRARY_PATH    ${AOCL_ROOT}/amd-libm/lib
-prepend-path LIBRARY_PATH    ${AOCL_ROOT}/amd-libflame/lib
-prepend-path LIBRARY_PATH    ${AOCL_ROOT}/amd-fftw/lib
-prepend-path LIBRARY_PATH    ${AOCL_ROOT}/amd-blis/lib
-prepend-path LD_LIBRARY_PATH ${AOCL_ROOT}/amd-securerng/lib
-prepend-path LD_LIBRARY_PATH ${AOCL_ROOT}/amd-scalapack/lib
-prepend-path LD_LIBRARY_PATH ${AOCL_ROOT}/amd-rng/rng/lib
-prepend-path LD_LIBRARY_PATH ${AOCL_ROOT}/amd-libm/lib
-prepend-path LD_LIBRARY_PATH ${AOCL_ROOT}/amd-libflame/lib
-prepend-path LD_LIBRARY_PATH ${AOCL_ROOT}/amd-fftw/lib
-prepend-path LD_LIBRARY_PATH ${AOCL_ROOT}/amd-blis/lib
+prepend-path CPATH           ${MODULE_ROOT}/include
+prepend-path LIBRARY_PATH    ${MODULE_ROOT}/lib
+prepend-path LD_LIBRARY_PATH ${MODULE_ROOT}/lib
 
-module-whatis "${AOCL_TEXT} version ${VERSION}"
+module-whatis "${MODULE_TEXT} version ${VERSION}"
 
 proc ModulesHelp {} {
-	global AOCL_TEXT
-	puts stderr "This module sets up the environment for ${AOCL_TEXT}"
+	global MODULE_TEXT
+	puts stderr "This module sets up the environment for ${MODULE_TEXT}"
 	puts stderr "by adapting the following environment variables:"
 	puts stderr "CPATH"
 	puts stderr "LIBRARY_PATH"