[aomp-amdgpu] Successful build in clean chroot (#295)

3 files changed, 58 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf82b6fca821..d12a0b64d016 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = aomp-amdgpu
 	pkgdesc = Clang/LLVM based compiler with added support for the OpenMP API on Radeon GPUs
 	pkgver = 11.6.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ROCm-Developer-Tools/aomp
 	arch = x86_64
 	license = Apache
 	makedepends = git
 	makedepends = cmake
 	makedepends = python
+	makedepends = mesa
 	depends = z3
 	depends = numactl
 	depends = pciutils
@@ -18,9 +19,11 @@ pkgbase = aomp-amdgpu
 	source = aomp-amdgpu-11.6.2.tar.gz::https://github.com/ROCm-Developer-Tools/aomp/archive/rel_11.6-2.tar.gz
 	source = disable_ocl_tests.patch
 	source = adjust_rpath.patch
+	source = remove_gcc_logic.patch
 	sha256sums = e4623ecfbe743676d068b17b113aadce4524a79be31b0540a216f9597cbd9fe5
 	sha256sums = bf3aab8fc2c828554ba76ab1876179130704f1c35906228fcf7e94239f5e4170
 	sha256sums = 94c670cd991c95a7b6312feb77d32a11c1ac1b839218bcd251042563b7af1a44
+	sha256sums = d1040410c7cebc109d2905722e959d4e9d3e4f122fe0a4ae72e3f3d8e5b9a722
 
 pkgname = aomp-amdgpu
 
diff --git a/PKGBUILD b/PKGBUILD
index 44fc68ab2c6f..39243fa1f958 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,18 +5,20 @@ pkgname=aomp-amdgpu
 pkgdesc='Clang/LLVM based compiler with added support for the OpenMP API on Radeon GPUs'
 _pkgver=11.6-2
 pkgver=11.6.2
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://github.com/ROCm-Developer-Tools/aomp'
 license=('Apache')
 depends=(z3 numactl pciutils libelf libffi)
-makedepends=(git cmake python)
+makedepends=(git cmake python mesa)
 source=("${pkgname}-${pkgver}.tar.gz::$url/archive/rel_$_pkgver.tar.gz"
         'disable_ocl_tests.patch'
-        'adjust_rpath.patch')
+        'adjust_rpath.patch'
+	'remove_gcc_logic.patch')
 sha256sums=('e4623ecfbe743676d068b17b113aadce4524a79be31b0540a216f9597cbd9fe5'
             'bf3aab8fc2c828554ba76ab1876179130704f1c35906228fcf7e94239f5e4170'
-            '94c670cd991c95a7b6312feb77d32a11c1ac1b839218bcd251042563b7af1a44')
+            '94c670cd991c95a7b6312feb77d32a11c1ac1b839218bcd251042563b7af1a44'
+	    'd1040410c7cebc109d2905722e959d4e9d3e4f122fe0a4ae72e3f3d8e5b9a722')
 options=(staticlibs !strip)
 _dirname="$(basename "$url")-$(basename ${source[0]} .tar.gz)"
 
@@ -32,6 +34,7 @@ prepare() {
 
     cd "$srcdir/aomp"
     patch -Np1 -i "$srcdir/adjust_rpath.patch"
+    patch -p1  -i "$srcdir/remove_gcc_logic.patch"
 }
 
 package() {
diff --git a/remove_gcc_logic.patch b/remove_gcc_logic.patch
new file mode 100644
index 000000000000..e8da183b0fbf
--- /dev/null
+++ b/remove_gcc_logic.patch
@@ -0,0 +1,47 @@
+*** aomp/bin/build_openmp.sh.bak	2020-07-11 16:55:42.995876206 +0200
+--- aomp/bin/build_openmp.sh	2020-07-11 16:56:14.952367513 +0200
+***************
+*** 73,106 ****
+     $SUDO rm $INSTALL_OPENMP/testfile
+  fi
+  
+! GCCMIN=7
+! if [ "$AOMP_BUILD_CUDA" == 1 ] ; then
+!    if [ -f $CUDABIN/nvcc ] ; then
+!       CUDAVER=`$CUDABIN/nvcc --version | grep compilation | cut -d" " -f5 | cut -d"." -f1 `
+!       echo "CUDA VERSION IS $CUDAVER"
+!       if [ $CUDAVER -gt 8 ] ; then
+!         GCCMIN=7
+!       fi
+!    fi
+! fi
+! 
+! function getgcc7orless(){
+!    _loc=`which gcc`
+!    [ "$_loc" == "" ] && return
+!    gccver=`$_loc --version | grep gcc | cut -d")" -f2 | cut -d"." -f1`
+!    [ $gccver -gt $GCCMIN ] && _loc=`which gcc-$GCCMIN`
+!    echo $_loc
+! }
+! function getgxx7orless(){
+!    _loc=`which g++`
+!    [ "$_loc" == "" ] && return
+!    gxxver=`$_loc --version | grep g++ | cut -d")" -f2 | cut -d"." -f1`
+!    [ $gxxver -gt $GCCMIN ] && _loc=`which g++-$GCCMIN`
+!    echo $_loc
+! }
+! 
+! GCCLOC=$(getgcc7orless)
+! GXXLOC=$(getgxx7orless)
+  if [ "$GCCLOC" == "" ] ; then
+     echo "ERROR: NO ADEQUATE gcc"
+     echo "       Please install gcc-5 or gcc-7"
+--- 73,80 ----
+     $SUDO rm $INSTALL_OPENMP/testfile
+  fi
+  
+! GCCLOC=/usr/bin/gcc
+! GXXLOC=/usr/bin/g++
+  if [ "$GCCLOC" == "" ] ; then
+     echo "ERROR: NO ADEQUATE gcc"
+     echo "       Please install gcc-5 or gcc-7"