Missing deps + `ld.so.conf` instructions

Includes:
fixup! referenced `gcc` in `aocc` patching
fixup! patch binaries after folder fixes

4 files changed, 35 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 847080350bbd..01a4040f3668 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
 pkgbase = aocl
 	pkgdesc = AMD Optimizing CPU Libraries
 	pkgver = 4.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://developer.amd.com/amd-aocl/
 	arch = x86_64
 	license = custom
+	makedepends = patchelf
 	optdepends = env-modules
 	options = staticlibs
 	options = !strip
 	source = local://aocl-linux-aocc-4.1.0.tar.gz
 	source = local://aocl-linux-gcc-4.1.0.tar.gz
-	source = local://aocl-aocc.install
-	source = local://aocl-gcc.install
-	source = local://modulefile
+	source = aocl-aocc.install
+	source = aocl-gcc.install
+	source = modulefile
 	sha256sums = 25c3d86970a355205de0d139a23e251f070dd76242114b98390fe8f90503e810
 	sha256sums = 9f37321b86443e1d9e62bd32020e2b886ac0a5b25941c7321dd27019f153bb21
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
+	sha256sums = 1b538de9561a5de59a69b5697ba5f494391897bd6d34101e7847e821e10ce550
+	sha256sums = c9ddea1c7e02048239dd6f800bd2ec807bcb0b2e632fe26537b2be0d8eafba37
+	sha256sums = dddc96efcb7db40eb98b4b00eaa78c4b5f01b552ebf3c58a2a1949cfba1d722e
 
 pkgname = aocl-aocc
 	install = aocl-aocc.install
diff --git a/PKGBUILD b/PKGBUILD
index 8346f5605b0d..3741664c63b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
 # Maintainer: Darjan Krijan [https://disc-kuraudo.eu]
+# Contributor: Jesse R Codling <codling@umich.edu>
 # Manual download of 'aocl-linux-aocc-${pkgver}.tar.gz' required from upstream
 # Manual download of 'aocl-linux-gcc-${pkgver}.tar.gz'  required from upstream
 
 pkgbase=aocl
 pkgname=(aocl-aocc aocl-gcc)
 pkgver=4.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="AMD Optimizing CPU Libraries"
 arch=('x86_64')
 license=('custom')
@@ -13,19 +14,18 @@ url="https://developer.amd.com/amd-aocl/"
 source=(
 	"local://${pkgbase}-linux-aocc-${pkgver}.tar.gz"
 	"local://${pkgbase}-linux-gcc-${pkgver}.tar.gz"
-	"local://${pkgbase}-aocc.install"
-	"local://${pkgbase}-gcc.install"
-	"local://modulefile"
+	"${pkgbase}-aocc.install"
+	"${pkgbase}-gcc.install"
+	"modulefile"
 )
 options=('staticlibs' '!strip')
+makedepends=('patchelf')
 optdepends=('env-modules')
-sha256sums=(
-	"25c3d86970a355205de0d139a23e251f070dd76242114b98390fe8f90503e810"
-	"9f37321b86443e1d9e62bd32020e2b886ac0a5b25941c7321dd27019f153bb21"
-	"SKIP"
-	"SKIP"
-	"SKIP"
-)
+sha256sums=('25c3d86970a355205de0d139a23e251f070dd76242114b98390fe8f90503e810'
+            '9f37321b86443e1d9e62bd32020e2b886ac0a5b25941c7321dd27019f153bb21'
+            '1b538de9561a5de59a69b5697ba5f494391897bd6d34101e7847e821e10ce550'
+            'c9ddea1c7e02048239dd6f800bd2ec807bcb0b2e632fe26537b2be0d8eafba37'
+            'dddc96efcb7db40eb98b4b00eaa78c4b5f01b552ebf3c58a2a1949cfba1d722e')
 
 package_aocl-aocc() {
 	install=${pkgname}.install
@@ -45,6 +45,10 @@ package_aocl-aocc() {
 	mv ${prefix}/${pkgver}/* ${prefix}
 	rm -r ${prefix}/${pkgver}
 
+	# add missing libFLAME dependency on BLIS
+	patchelf --add-needed ${aocl_prefix}/aocc/lib_ILP64/libblis-mt.so ${prefix}/aocc/lib_ILP64/libflame.so
+	patchelf --add-needed ${aocl_prefix}/aocc/lib_LP64/libblis-mt.so ${prefix}/aocc/lib_LP64/libflame.so
+
 	# fix amd-libs.cfg containing ${pkgdir}
 	sed -e "s:=.*/opt:=/opt:g" -i ${prefix}/aocc/amd-libs.cfg
 
@@ -72,6 +76,10 @@ package_aocl-gcc() {
 	mv ${prefix}/${pkgver}/* ${prefix}
 	rm -r ${prefix}/${pkgver}
 
+	# add missing libFLAME dependency on BLIS
+	patchelf --add-needed ${aocl_prefix}/gcc/lib_ILP64/libblis-mt.so ${prefix}/gcc/lib_ILP64/libflame.so
+	patchelf --add-needed ${aocl_prefix}/gcc/lib_LP64/libblis-mt.so ${prefix}/gcc/lib_LP64/libflame.so
+
 	# fix amd-libs.cfg containing ${pkgdir} and ${pkgver}
 	sed -e "s:=.*/opt:=/opt:g" -e "s:/${pkgver}::g" -i ${prefix}/gcc/amd-libs.cfg
 
diff --git a/aocl-aocc.install b/aocl-aocc.install
index 9117229fc8d3..5ae4ea354896 100644
--- a/aocl-aocc.install
+++ b/aocl-aocc.install
@@ -5,6 +5,10 @@ post_install() {
 		echo "  $ module load aocl-aocc"
 		echo "to set up the environment for AMD Optimizing CPU Libraries."
 	fi
+	echo "You can enable AMD Optimizing CPU Libraries globally"
+	echo 'by creating `/etc/ld.so.conf.d/aocl-aocc.conf` containing:'
+	echo " 	/opt/aocl/aocc/lib/"
+	echo 'then running `ldconfig`'
 }
 
 post_upgrade() {
diff --git a/aocl-gcc.install b/aocl-gcc.install
index ce5339dca828..c55d9710ff19 100644
--- a/aocl-gcc.install
+++ b/aocl-gcc.install
@@ -5,6 +5,10 @@ post_install() {
 		echo "  $ module load aocl-gcc"
 		echo "to set up the environment for AMD Optimizing CPU Libraries."
 	fi
+	echo "You can enable AMD Optimizing CPU Libraries globally"
+	echo 'by creating `/etc/ld.so.conf.d/aocl-gcc.conf` containing:'
+	echo " 	/opt/aocl/gcc/lib/"
+	echo 'then running `ldconfig`'
 }
 
 post_upgrade() {