Split the package to aocl-aocc and aocl-gcc, removed libs directory with broken symlinks from package() paths, added conflict to modulefile

4 files changed, 56 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9df66bcbd684..7b7283018d1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aocl
 	pkgdesc = AMD Optimizing CPU Libraries
 	pkgver = 2.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://developer.amd.com/amd-aocl/
 	install = aocl.install
 	arch = x86_64
@@ -9,12 +9,16 @@ pkgbase = aocl
 	depends = 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.install
 	source = local://modulefile
+	sha256sums = e7af89ca23a545cc8bea54c2cb5005a42bf359611f5d4c28336f78f691da3a23
 	sha256sums = 8ea9ec16051893e480f7ba09babeaa833897586aa4d0c2c53b22132b5884150c
 	sha256sums = SKIP
 	sha256sums = SKIP
 
-pkgname = aocl
+pkgname = aocl-aocc
+
+pkgname = aocl-gcc
 
diff --git a/PKGBUILD b/PKGBUILD
index 70119e857a06..72706a00510f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,26 @@
 # 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
 
-pkgname=aocl
+pkgbase=aocl
+pkgname=(aocl-aocc aocl-gcc)
 pkgver=2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="AMD Optimizing CPU Libraries"
 arch=('x86_64')
 license=('custom')
 url="https://developer.amd.com/amd-aocl/"
-os=ubuntu
 source=(
-	"local://${pkgname}-linux-gcc-${pkgver}.tar.gz"
-	"local://aocl.install"
+	"local://${pkgbase}-linux-aocc-${pkgver}.tar.gz"
+	"local://${pkgbase}-linux-gcc-${pkgver}.tar.gz"
+	"local://${pkgbase}.install"
 	"local://modulefile"
 )
 options=('staticlibs' '!strip')
 depends=('env-modules')
-install=aocl.install
+install=${pkgbase}.install
 sha256sums=(
+	"e7af89ca23a545cc8bea54c2cb5005a42bf359611f5d4c28336f78f691da3a23"
 	"8ea9ec16051893e480f7ba09babeaa833897586aa4d0c2c53b22132b5884150c"
 	"SKIP"
 	"SKIP"
@@ -29,25 +32,57 @@ if [ -z ${MODULESHOME} ]; then
 	exit 1
 fi
 
-aocl_prefix=/opt/${pkgname}
+package_aocl-aocc() {
+	aocl_prefix=/opt/${pkgname}
+	prefix=${pkgdir}/${aocl_prefix}
+	mkdir -p ${prefix}
+
+	cd ${srcdir}/${pkgbase}-linux-aocc-${pkgver}
+
+	cp AOCL_User_Guide_${pkgver}.pdf ${prefix}
+
+	./install.sh -t ${prefix}
+
+	# strip unneeded directories
+	mv ${prefix}/amd/${pkgbase}/${pkgver}/* ${prefix}
+	rm -r ${prefix}/amd
 
-package() {
+	# delete libs directory with broken symlinks
+	rm -rf ${prefix}/libs
+
+	# modulefile
+	echo -e "\nSymlinking modulefile..."
+	cp ${srcdir}/modulefile ${prefix}
+	mkdir -p ${pkgdir}${MODULESHOME}/modulefiles/
+	ln -s ${aocl_prefix}/modulefile ${pkgdir}${MODULESHOME}/modulefiles/${pkgname}
+}
+
+package_aocl-gcc() {
+	aocl_prefix=/opt/${pkgname}
 	prefix=${pkgdir}/${aocl_prefix}
 	mkdir -p ${prefix}
 
-	cd ${srcdir}/${pkgname}-linux-gcc-${pkgver}
+	cd ${srcdir}/${pkgbase}-linux-gcc-${pkgver}
 
 	cp AOCL_User_Guide_${pkgver}.pdf ${prefix}
 
 	./install.sh -t ${prefix}
 
 	# strip unneeded directories
-	mv ${prefix}/amd/${pkgname}/${pkgver}/* ${prefix}
+	mv ${prefix}/amd/${pkgbase}/${pkgver}/* ${prefix}
 	rm -r ${prefix}/amd
 
+	# delete libs directory with broken symlinks
+	rm -rf ${prefix}/libs
+
 	# modulefile
 	echo -e "\nSymlinking modulefile..."
-	cp ${srcdir}/modulefile ${pkgdir}${aocl_prefix}
+	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}
 }
+
+# vim:set ts=4
diff --git a/aocl.install b/aocl.install
index d6470eb32fc1..375c50b3a86c 100644
--- a/aocl.install
+++ b/aocl.install
@@ -1,5 +1,5 @@
 post_install() {
-	echo "Use 'module load aocl' to set up the environment for AMD Optimizing CPU Libraries."
+	echo "Use 'module load aocl-gcc' or 'module load aocl-aocc' to set up the environment for AMD Optimizing CPU Libraries."
 }
 
 post_upgrade() {
diff --git a/modulefile b/modulefile
index a4f0c4d477b1..10e5aa9eca85 100644
--- a/modulefile
+++ b/modulefile
@@ -3,12 +3,14 @@
 # Created by Darjan Krijan <darjan_krijan@gmx.de>
 #
 
-set MODULE    "aocl"
+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)"
 
+conflict aocl-gcc
+
 prepend-path CPATH           ${AOCL_ROOT}/amd-securerng/include
 prepend-path CPATH           ${AOCL_ROOT}/amd-scalapack/include
 prepend-path CPATH           ${AOCL_ROOT}/amd-rng/include