aocl 2.2

3 files changed, 23 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 003a99584c4b..9518920d64e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = aocl
 	pkgdesc = AMD Optimizing CPU Libraries
-	pkgver = 2.1
-	pkgrel = 6
+	pkgver = 2.2
+	pkgrel = 1
 	url = https://developer.amd.com/amd-aocl/
 	arch = x86_64
 	license = custom
 	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-linux-aocc-2.2-4.tar.gz
+	source = local://aocl-linux-gcc-2.2-4.tar.gz
 	source = local://aocl-aocc.install
 	source = local://aocl-gcc.install
 	source = local://modulefile
-	sha256sums = e7af89ca23a545cc8bea54c2cb5005a42bf359611f5d4c28336f78f691da3a23
-	sha256sums = 8ea9ec16051893e480f7ba09babeaa833897586aa4d0c2c53b22132b5884150c
+	sha256sums = 4bdc5caec0233066ded3e2bfedb1e03bdeec82725361764d8860075f64ff4031
+	sha256sums = 2779d4d117c0a2fcfb06c8d6f135fbcab4bbf8f63a6d81c12efde09516977a3b
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index ac26fc8ab5d2..21bb5f6871b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,16 @@
 
 pkgbase=aocl
 pkgname=(aocl-aocc aocl-gcc)
-pkgver=2.1
-pkgrel=6
+pkgver=2.2
+_pkgrel=4
+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"
@@ -20,8 +21,8 @@ source=(
 options=('staticlibs' '!strip')
 depends=('env-modules')
 sha256sums=(
-	"e7af89ca23a545cc8bea54c2cb5005a42bf359611f5d4c28336f78f691da3a23"
-	"8ea9ec16051893e480f7ba09babeaa833897586aa4d0c2c53b22132b5884150c"
+	"4bdc5caec0233066ded3e2bfedb1e03bdeec82725361764d8860075f64ff4031"
+	"2779d4d117c0a2fcfb06c8d6f135fbcab4bbf8f63a6d81c12efde09516977a3b"
 	"SKIP"
 	"SKIP"
 	"SKIP"
@@ -40,15 +41,15 @@ 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}/* ${prefix}
+	rm -r ${prefix}/${pkgver}
 
 	# delete libs directory with broken symlinks
 	rm -rf ${prefix}/libs
@@ -67,18 +68,15 @@ 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
-
-	# delete libs directory with broken symlinks
-	rm -rf ${prefix}/libs
+	mv ${prefix}/${pkgver}/* ${prefix}
+	rm -r ${prefix}/${pkgver}
 
 	# modulefile
 	echo -e "\nSymlinking modulefile..."
diff --git a/modulefile b/modulefile
index e6e3e2a3df4b..8801f3e601bc 100644
--- a/modulefile
+++ b/modulefile
@@ -5,32 +5,15 @@
 
 set MODULE    "aocl-aocc"
 set BASE_DIR  "/opt"
-set VERSION   "2.1"
+set VERSION   "2.2"
 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-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           ${AOCL_ROOT}/include
+prepend-path LIBRARY_PATH    ${AOCL_ROOT}/lib
+prepend-path LD_LIBRARY_PATH ${AOCL_ROOT}/lib
 
 module-whatis "${AOCL_TEXT} version ${VERSION}"