openmp-extras: update to 5.2.0 (#809)

* Update checksum
* New patches
* Delete obsolete/non-functional patches
* Update .SRCINFO

Co-authored-by: linedot <s.nassyr@xcpp.org>

8 files changed, 66 insertions, 122 deletions

diff --git a/.SRCINFO b/.SRCINFO
index de7ffad864db..db1a53e6017b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openmp-extras
 	pkgdesc = Radeon Open Compute - openmp-extras with flang (OpenMP AMD GPU Offloading)
-	pkgver = 5.1.3
+	pkgver = 5.2.0
 	pkgrel = 1
 	url = https://github.com/ROCm-Developer-Tools/aomp
 	arch = x86_64
@@ -15,31 +15,29 @@ pkgbase = openmp-extras
 	depends = rocm-llvm
 	options = staticlibs
 	options = !lto
-	source = llvm-amdgpu-5.1.3.tar.gz::https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-5.1.3.tar.gz
-	source = aomp-5.1.3.tar.gz::https://github.com/ROCm-Developer-Tools/aomp/archive/rocm-5.1.3.tar.gz
-	source = aomp-extras-5.1.3.tar.gz::https://github.com/ROCm-Developer-Tools/aomp-extras/archive/rocm-5.1.3.tar.gz
-	source = aomp-device-libs-5.1.3.tar.gz::https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.1.3.tar.gz
-	source = flang-5.1.3.tar.gz::https://github.com/ROCm-Developer-Tools/flang/archive/rocm-5.1.3.tar.gz
+	source = llvm-amdgpu-5.2.0.tar.gz::https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-5.2.0.tar.gz
+	source = aomp-5.2.0.tar.gz::https://github.com/ROCm-Developer-Tools/aomp/archive/rocm-5.2.0.tar.gz
+	source = aomp-extras-5.2.0.tar.gz::https://github.com/ROCm-Developer-Tools/aomp-extras/archive/rocm-5.2.0.tar.gz
+	source = aomp-device-libs-5.2.0.tar.gz::https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.2.0.tar.gz
+	source = flang-5.2.0.tar.gz::https://github.com/ROCm-Developer-Tools/flang/archive/rocm-5.2.0.tar.gz
 	source = llvm-project-hostrpc-fprintf-decl.patch
-	source = aomp-gcc8-only-for-cuda.patch
 	source = aomp-openmp-buildpath.patch
-	source = aomp-openmp-llvm.patch
-	source = aomp-flang-alarm-signature.patch
+	source = aomp-5.2.0-openmp-rocm_dir.patch
 	source = aomp-flang-decouple-out-dir-and-rocm-install.patch
 	source = aomp-flang-libomp-path.patch
-	source = aomp-extras-compiler-in-rocm-dir.patch
-	sha256sums = d236a2064363c0278f7ba1bb2ff1545ee4c52278c50640e8bb2b9cfef8a2f128
-	sha256sums = 8bab3d621343f419b29043ac0cb56e062f114991dc3ec1e33e786f771deecc8f
-	sha256sums = 2e3151a47d77166d071213af2a1691487691aae0abd5c1718d818a6d7d09cb2d
-	sha256sums = c41958560ec29c8bf91332b9f668793463904a2081c330c0d828bf2f91d4f04e
-	sha256sums = d7847b5c6e1344dc0b4723dbe76a859257b4c242644dedb34e425f07738530d4
+	source = aomp-extras-5.2.0-rocm-dir-llvm.patch
+	source = aomp-5.2.0-extras-version-string.patch
+	sha256sums = 0f892174111b78a02d1a00f8f46d9f80b9abb95513a7af38ecf2a5a0882fe87f
+	sha256sums = 20e21312816272222d1f427ea72a99a9a67077078552f5e2638a40860d161d25
+	sha256sums = 817c2e8975e56a8875ff56f9d1ea34d5e7e50f1b541b7f1236e3e5c8d9eee47f
+	sha256sums = 901674bc941115c72f82c5def61d42f2bebee687aefd30a460905996f838e16c
+	sha256sums = 20f48cac9b58496230fa2428eba4e15ec0a6e92d429569b154a328b7a8c5da17
 	sha256sums = c846bac17580e939492b843bee092c2e1b2b414a683bdb6be2973ae044642424
-	sha256sums = 705a7103c3aeff514e5645c130786172961c54673dfdd772caece3b5e7536088
 	sha256sums = f7ed1704ffb095bbe8512b1c567a111936685d35f64123c786194e4239277251
-	sha256sums = 6efb9538e016e1e6e2fb6ce52408bb6317c213ebdd46a60925447d0b43f42ee6
-	sha256sums = 7c796d44952da8f089dc3ee013970dba7be43c60eb90131f86ce7d15c67b4b9b
+	sha256sums = 0d91c5408192dcceacde986c3419592efc67ad40d359d127604ee9bfbdba477a
 	sha256sums = e82a4f065cc259095bf96778b913b97fe39d7c207e4e25ccf59d8fa264014262
 	sha256sums = ff3c3e56bfc11c0c9a6ab5c5392168da06aed3b4a21cdfcf7a149d12a69e2906
-	sha256sums = f8f57cdcc4ddf535323f4f84a4a4a4fa830fbad72b19c7ea45d74fa5579ee72f
+	sha256sums = bae31efe2dd3f6813e9198c210ba3390028ed89e0d47e86366bef741c70c4db7
+	sha256sums = 7c5372078c74facbd7cae451c3a717bf281344dcd5c4103e1c837d980e79ccc9
 
 pkgname = openmp-extras
diff --git a/PKGBUILD b/PKGBUILD
index 089339bce452..2a89eed755fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=openmp-extras
 pkgdesc='Radeon Open Compute - openmp-extras with flang (OpenMP AMD GPU Offloading)'
-pkgver=5.1.3
+pkgver=5.2.0
 pkgrel=1
 arch=('x86_64')
 url='https://github.com/ROCm-Developer-Tools/aomp'
@@ -19,28 +19,27 @@ source=("llvm-amdgpu-${pkgver}.tar.gz::$llvm_url/archive/rocm-$pkgver.tar.gz"
         "aomp-device-libs-$pkgver.tar.gz::$dlibs_url/archive/rocm-$pkgver.tar.gz"
         "flang-$pkgver.tar.gz::$flang_url/archive/rocm-$pkgver.tar.gz"
         "llvm-project-hostrpc-fprintf-decl.patch"
-        "aomp-gcc8-only-for-cuda.patch"
         "aomp-openmp-buildpath.patch"
-        "aomp-openmp-llvm.patch"
-        "aomp-flang-alarm-signature.patch"
+        "aomp-5.2.0-openmp-rocm_dir.patch"
         "aomp-flang-decouple-out-dir-and-rocm-install.patch"
         "aomp-flang-libomp-path.patch"
-        "aomp-extras-compiler-in-rocm-dir.patch"
+        "aomp-extras-5.2.0-rocm-dir-llvm.patch"
+        "aomp-5.2.0-extras-version-string.patch"
         )
 sha256sums=(
-            'd236a2064363c0278f7ba1bb2ff1545ee4c52278c50640e8bb2b9cfef8a2f128'
-            '8bab3d621343f419b29043ac0cb56e062f114991dc3ec1e33e786f771deecc8f'
-            '2e3151a47d77166d071213af2a1691487691aae0abd5c1718d818a6d7d09cb2d'
-            'c41958560ec29c8bf91332b9f668793463904a2081c330c0d828bf2f91d4f04e'
-            'd7847b5c6e1344dc0b4723dbe76a859257b4c242644dedb34e425f07738530d4'
+            '0f892174111b78a02d1a00f8f46d9f80b9abb95513a7af38ecf2a5a0882fe87f'
+            '20e21312816272222d1f427ea72a99a9a67077078552f5e2638a40860d161d25'
+            '817c2e8975e56a8875ff56f9d1ea34d5e7e50f1b541b7f1236e3e5c8d9eee47f'
+            '901674bc941115c72f82c5def61d42f2bebee687aefd30a460905996f838e16c'
+            '20f48cac9b58496230fa2428eba4e15ec0a6e92d429569b154a328b7a8c5da17'
+
             'c846bac17580e939492b843bee092c2e1b2b414a683bdb6be2973ae044642424'
-            '705a7103c3aeff514e5645c130786172961c54673dfdd772caece3b5e7536088'
             'f7ed1704ffb095bbe8512b1c567a111936685d35f64123c786194e4239277251'
-            '6efb9538e016e1e6e2fb6ce52408bb6317c213ebdd46a60925447d0b43f42ee6'
-            '7c796d44952da8f089dc3ee013970dba7be43c60eb90131f86ce7d15c67b4b9b'
+            '0d91c5408192dcceacde986c3419592efc67ad40d359d127604ee9bfbdba477a'
             'e82a4f065cc259095bf96778b913b97fe39d7c207e4e25ccf59d8fa264014262'
             'ff3c3e56bfc11c0c9a6ab5c5392168da06aed3b4a21cdfcf7a149d12a69e2906'
-            'f8f57cdcc4ddf535323f4f84a4a4a4fa830fbad72b19c7ea45d74fa5579ee72f'
+            'bae31efe2dd3f6813e9198c210ba3390028ed89e0d47e86366bef741c70c4db7'
+            '7c5372078c74facbd7cae451c3a717bf281344dcd5c4103e1c837d980e79ccc9'
             )
 options=(staticlibs !lto)
 
@@ -54,17 +53,14 @@ prepare() {
     patch -Np1 < "$srcdir/llvm-project-hostrpc-fprintf-decl.patch"
 
     cd "$srcdir/aomp-rocm-$pkgver"
-    patch -Np1 < "$srcdir/aomp-gcc8-only-for-cuda.patch"
     patch -Np1 < "$srcdir/aomp-openmp-buildpath.patch"
-    patch -Np1 < "$srcdir/aomp-openmp-llvm.patch"
+    patch -Np1 < "$srcdir/aomp-5.2.0-openmp-rocm_dir.patch"
     patch -Np1 < "$srcdir/aomp-flang-decouple-out-dir-and-rocm-install.patch"
     patch -Np1 < "$srcdir/aomp-flang-libomp-path.patch"
-
-    cd "$srcdir/flang"
-    patch -Np1 < "$srcdir/aomp-flang-alarm-signature.patch"
+    patch -Np1 < "$srcdir/aomp-5.2.0-extras-version-string.patch"
 
     cd "$srcdir/aomp-extras"
-    patch -Np1 < "$srcdir/aomp-extras-compiler-in-rocm-dir.patch"
+    patch -Np1 < "$srcdir/aomp-extras-5.2.0-rocm-dir-llvm.patch"
 
 }
 
diff --git a/aomp-5.2.0-extras-version-string.patch b/aomp-5.2.0-extras-version-string.patch
new file mode 100644
index 000000000000..8d2b26be3fd4
--- /dev/null
+++ b/aomp-5.2.0-extras-version-string.patch
@@ -0,0 +1,12 @@
+diff --git a/bin/build_extras.sh b/bin/build_extras.sh
+index c8f35e3e..e98422c6 100755
+--- a/bin/build_extras.sh
++++ b/bin/build_extras.sh
+@@ -121,6 +121,7 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
+   -DCMAKE_BUILD_TYPE=Release \
+   -DROCM_DIR=$ROCM_DIR \
+   -DAOMP_STANDALONE_BUILD=0 \
++  -DAOMP_VERSION_STRING=\"5.2.0\" \
+   -DDEVICELIBS_ROOT=$DEVICELIBS_ROOT \
+   -DNEW_BC_PATH=1 \
+   -DCMAKE_INSTALL_PREFIX=$INSTALL_EXTRAS \
diff --git a/aomp-openmp-llvm.patch b/aomp-5.2.0-openmp-rocm_dir.patch
index ea0e983cc97b..e9aa2267fc6e 100644
--- a/aomp-openmp-llvm.patch
+++ b/aomp-5.2.0-openmp-rocm_dir.patch
@@ -1,6 +1,8 @@
---- a/bin/build_openmp.sh 2022-03-01 13:10:36.609965678 +0100
-+++ b/bin/build_openmp.sh 2022-03-01 13:17:30.403456565 +0100
-@@ -113,14 +113,14 @@
+diff --git a/bin/build_openmp.sh b/bin/build_openmp.sh
+index 99b58ea6..d456bd8c 100755
+--- a/bin/build_openmp.sh
++++ b/bin/build_openmp.sh
+@@ -91,14 +91,14 @@ COMMON_CMAKE_OPTS="-DDEVICELIBS_ROOT=$DEVICELIBS_ROOT
  -DROCM_DIR=$ROCM_DIR
  -DLIBOMPTARGET_ENABLE_DEBUG=ON
  -DCMAKE_INSTALL_PREFIX=$INSTALL_OPENMP
@@ -8,7 +10,7 @@
 +-DLLVM_INSTALL_PREFIX=$ROCM_DIR/llvm
  -DLLVM_MAIN_INCLUDE_DIR=$LLVM_PROJECT_ROOT/llvm/include
  -DLIBOMPTARGET_LLVM_INCLUDE_DIRS=$LLVM_PROJECT_ROOT/llvm/include
- -DCMAKE_PREFIX_PATH=$ROCM_DIR;$ROCM_DIR/include/hsa;$DEVICELIBS_BUILD_PATH;$OUT_DIR/build/devicelibs
+ -DCMAKE_PREFIX_PATH=$OUT_DIR/build/devicelibs;$ROCM_DIR;$ROCM_DIR/include/hsa
 --DCMAKE_C_COMPILER=$OUT_DIR/llvm/bin/clang
 --DCMAKE_CXX_COMPILER=$OUT_DIR/llvm/bin/clang++
 --DOPENMP_TEST_C_COMPILER=$OUT_DIR/llvm/bin/clang
@@ -17,7 +19,6 @@
 +-DCMAKE_CXX_COMPILER=$ROCM_DIR/llvm/bin/clang++
 +-DOPENMP_TEST_C_COMPILER=$ROCM_DIR/llvm/bin/clang
 +-DOPENMP_TEST_CXX_COMPILER=$ROCM_DIR/llvm/bin/clang++"
-
+ 
  if [ "$AOMP_BUILD_CUDA" == 1 ] ; then
-   if [ "$GCCLOC" == "" ] ; then
-
+    COMMON_CMAKE_OPTS="$COMMON_CMAKE_OPTS
diff --git a/aomp-extras-5.2.0-rocm-dir-llvm.patch b/aomp-extras-5.2.0-rocm-dir-llvm.patch
new file mode 100644
index 000000000000..5acba29e8225
--- /dev/null
+++ b/aomp-extras-5.2.0-rocm-dir-llvm.patch
@@ -0,0 +1,13 @@
+diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
+index 4f9208a..ca46a91 100644
+--- a/utils/CMakeLists.txt
++++ b/utils/CMakeLists.txt
+@@ -19,7 +19,7 @@ add_custom_target(aomputils ALL)
+ 
+ find_package(LLVM QUIET CONFIG
+   PATHS
+-  $ENV{AOMP}
++  $ENV{ROCM_DIR}/llvm
+   ${LLVM_DIR}
+   NO_DEFAULT_PATH
+ )
diff --git a/aomp-extras-compiler-in-rocm-dir.patch b/aomp-extras-compiler-in-rocm-dir.patch
deleted file mode 100644
index d5a26d9a232d..000000000000
--- a/aomp-extras-compiler-in-rocm-dir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- aomp-extras-rocm-4.5.0/aomp-device-libs/aompextras/CMakeLists.txt	2021-08-09 23:36:08.000000000 +0200
-+++ aomp-extras-rocm-4.5.0-patched/aomp-device-libs/aompextras/CMakeLists.txt	2021-11-19 19:56:06.737469951 +0100
-@@ -13,7 +13,7 @@
- #  Try to get LLVM_COMPILER from HIP, then AOMP , then default /usr/local/hip
- set(AOMP $ENV{AOMP})
- if(AOMP)
--  set(LLVM_COMPILER ${AOMP})
-+  set(LLVM_COMPILER ${ROCM_DIR}/llvm)
- else()
-   set(LLVM_COMPILER "$ENV{HOME}/rocm/aomp")
- endif()
---- aomp-extras-rocm-4.5.0/utils/CMakeLists.txt	2021-08-09 23:36:08.000000000 +0200
-+++ aomp-extras-rocm-4.5.0-patched/utils/CMakeLists.txt	2021-11-19 19:39:53.406512322 +0100
-@@ -19,7 +19,7 @@
- 
- find_package(LLVM QUIET CONFIG
-   PATHS
--  $ENV{AOMP}
-+  $ENV{ROCM_DIR}/llvm
-   ${LLVM_DIR}
-   NO_DEFAULT_PATH
- )
diff --git a/aomp-flang-alarm-signature.patch b/aomp-flang-alarm-signature.patch
deleted file mode 100644
index abb1655979bd..000000000000
--- a/aomp-flang-alarm-signature.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -urN flang-rocm-5.0.1-unpatched/runtime/flang/alarm3f.c flang-rocm-5.0.1/runtime/flang/alarm3f.c
---- flang-rocm-5.0.1-unpatched/runtime/flang/alarm3f.c  2022-03-01 13:57:36.463305752 +0100
-+++ flang-rocm-5.0.1/runtime/flang/alarm3f.c    2022-03-01 13:59:55.300264387 +0100
-@@ -16,7 +16,7 @@
- /*
- extern void (*signal(int, void (*)(int)))(int);
- */
--extern int alarm();
-+extern unsigned int alarm(unsigned int __seconds);
-
- int ENT3F(ALARM, alarm)(int *time, void (*proc)())
- {
diff --git a/aomp-gcc8-only-for-cuda.patch b/aomp-gcc8-only-for-cuda.patch
deleted file mode 100644
index 812098ac6c9a..000000000000
--- a/aomp-gcc8-only-for-cuda.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --color -urN aomp-rocm-4.3.1/bin/build_openmp.sh aomp-rocm-4.3.1-patched/bin/build_openmp.sh
---- aomp-rocm-4.3.1/bin/build_openmp.sh	2021-08-27 05:56:05.000000000 +0200
-+++ aomp-rocm-4.3.1-patched/bin/build_openmp.sh	2021-10-29 19:43:56.338668126 +0200
-@@ -99,21 +99,11 @@
- 
- GCCLOC=$(getgcc8orless)
- GXXLOC=$(getgxx8orless)
--if [ "$GCCLOC" == "" ] ; then
--   echo "ERROR: NO ADEQUATE gcc"
--   echo "       Please install gcc-5, gcc-7, or gcc-8"
--   exit 1
--fi
--if [ "$GXXLOC" == "" ] ; then
--   echo "ERROR: NO ADEQUATE g++"
--   echo "       Please install g++-5, g++-7, or g++-8"
--   exit 1
--fi
- 
- GFXSEMICOLONS=`echo $GFXLIST | tr ' ' ';' `
- #COMMON_CMAKE_OPTS="#-DOPENMP_TEST_C_COMPILER=$AOMP/bin/clang
- #-DOPENMP_TEST_CXX_COMPILER=$AOMP/bin/clang++
- 
- COMMON_CMAKE_OPTS="-DDEVICELIBS_ROOT=$DEVICELIBS_ROOT
- -DOPENMP_ENABLE_LIBOMPTARGET=1
- -DOPENMP_ENABLE_LIBOMPTARGET_HSA=1
-@@ -127,6 +119,16 @@
- -DCMAKE_PREFIX_PATH=$ROCM_DIR;$ROCM_DIR/include/hsa"
- 
- if [ "$AOMP_BUILD_CUDA" == 1 ] ; then
-+  if [ "$GCCLOC" == "" ] ; then
-+     echo "ERROR: NO ADEQUATE gcc"
-+     echo "       Please install gcc-5, gcc-7, or gcc-8"
-+     exit 1
-+  fi
-+  if [ "$GXXLOC" == "" ] ; then
-+     echo "ERROR: NO ADEQUATE g++"
-+     echo "       Please install g++-5, g++-7, or g++-8"
-+     exit 1
-+  fi
-    COMMON_CMAKE_OPTS="$COMMON_CMAKE_OPTS
- -DLIBOMPTARGET_NVPTX_ENABLE_BCLIB=ON
- -DLIBOMPTARGET_NVPTX_CUDA_COMPILER=$AOMP/bin/clang++