amdlibm_vec.h include guard fix

2 files changed, 17 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af32f224f5a7..fa6725d45534 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aocl
 	pkgdesc = AMD Optimizing CPU Libraries
 	pkgver = 2.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://developer.amd.com/amd-aocl/
 	arch = x86_64
 	license = custom
diff --git a/PKGBUILD b/PKGBUILD
index 940a000208ac..763db642c8cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,16 @@
 pkgbase=aocl
 pkgname=(aocl-aocc aocl-gcc)
 pkgver=2.2
-_pkgrel=4
-pkgrel=1
+_pkgrel_aocc=4
+_pkgrel_gcc=5
+pkgrel=2
 pkgdesc="AMD Optimizing CPU Libraries"
 arch=('x86_64')
 license=('custom')
 url="https://developer.amd.com/amd-aocl/"
 source=(
-	"local://${pkgbase}-linux-aocc-${pkgver}-${_pkgrel}.tar.gz"
-	"local://${pkgbase}-linux-gcc-${pkgver}-5.tar.gz"
+	"local://${pkgbase}-linux-aocc-${pkgver}-${_pkgrel_aocc}.tar.gz"
+	"local://${pkgbase}-linux-gcc-${pkgver}-${_pkgrel_gcc}.tar.gz"
 	"local://${pkgbase}-aocc.install"
 	"local://${pkgbase}-gcc.install"
 	"local://modulefile"
@@ -41,7 +42,7 @@ package_aocl-aocc() {
 	prefix=${pkgdir}/${aocl_prefix}
 	mkdir -p ${prefix}
 
-	cd ${srcdir}/${pkgbase}-linux-aocc-${pkgver}-${_pkgrel}
+	cd ${srcdir}/${pkgbase}-linux-aocc-${pkgver}-${_pkgrel_aocc}
 
 	cp AOCL_User_Guide_${pkgver}.pdf ${prefix}
 
@@ -52,7 +53,11 @@ package_aocl-aocc() {
 	rm -r ${prefix}/${pkgver}
 
 	# delete libs directory with broken symlinks
-	rm -rf ${prefix}/libs
+	#rm -rf ${prefix}/libs
+
+	# fix amdlibm_vec.h
+	sed -e "s/#ifdef AMD_LIBM_VEC_EXTERNAL_H/#ifndef AMD_LIBM_VEC_EXTERNAL_H/g" \
+		-i ${prefix}/include/amdlibm_vec.h
 
 	# modulefile
 	echo -e "\nSymlinking modulefile..."
@@ -68,7 +73,7 @@ package_aocl-gcc() {
 	prefix=${pkgdir}/${aocl_prefix}
 	mkdir -p ${prefix}
 
-	cd ${srcdir}/${pkgbase}-linux-gcc-${pkgver}-5
+	cd ${srcdir}/${pkgbase}-linux-gcc-${pkgver}-${_pkgrel_gcc}
 
 	cp AOCL_User_Guide_${pkgver}.pdf ${prefix}
 
@@ -78,6 +83,10 @@ package_aocl-gcc() {
 	mv ${prefix}/${pkgver}/* ${prefix}
 	rm -r ${prefix}/${pkgver}
 
+	# fix amdlibm_vec.h
+	sed -e "s/#ifdef AMD_LIBM_VEC_EXTERNAL_H/#ifndef AMD_LIBM_VEC_EXTERNAL_H/g" \
+		-i ${prefix}/include/amdlibm_vec.h
+
 	# modulefile
 	echo -e "\nSymlinking modulefile..."
 	cp ${srcdir}/modulefile ${prefix}