From 5a7cf87ffcf2a7adfa24eb8a41e831c31dc93f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
 =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
Date: Sun, 11 Sep 2022 10:14:57 +0100
Subject: [PATCH] flang: update to 15.0.0

---
 .../0003-do-not-link-to-llvm-dylib.patch      | 20 +++++++++++++++
 mingw-w64-flang/PKGBUILD                      | 25 +++++++++++++------
 2 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 mingw-w64-flang/0003-do-not-link-to-llvm-dylib.patch

diff --git a/mingw-w64-flang/0003-do-not-link-to-llvm-dylib.patch b/mingw-w64-flang/0003-do-not-link-to-llvm-dylib.patch
new file mode 100644
index 0000000000..a5bc886c5f
--- /dev/null
+++ b/mingw-w64-flang/0003-do-not-link-to-llvm-dylib.patch
@@ -0,0 +1,20 @@
+--- a/cmake/modules/AddFlang.cmake
++++ b/cmake/modules/AddFlang.cmake
+@@ -61,7 +61,7 @@
+     set_property(GLOBAL APPEND PROPERTY FLANG_STATIC_LIBS ${name})
+   endif()
+ 
+-  llvm_add_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} ${srcs})
++  llvm_add_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} DISABLE_LLVM_LINK_LLVM_DYLIB ${srcs})
+ 
+   if (TARGET ${name})
+ 
+@@ -94,7 +94,7 @@
+ endmacro(add_flang_library)
+ 
+ macro(add_flang_executable name)
+-  add_llvm_executable(${name} ${ARGN})
++  add_llvm_executable(${name} ${ARGN} DISABLE_LLVM_LINK_LLVM_DYLIB)
+   set_target_properties(${name} PROPERTIES FOLDER "Flang executables")
+   set_flang_windows_version_resource_properties(${name})
+ endmacro(add_flang_executable)
diff --git a/mingw-w64-flang/PKGBUILD b/mingw-w64-flang/PKGBUILD
index 3f3e9a050c..5c9c09a624 100644
--- a/mingw-w64-flang/PKGBUILD
+++ b/mingw-w64-flang/PKGBUILD
@@ -2,7 +2,10 @@ _compiler=clang
 _realname=flang
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=14.0.6
+_version=15.0.0
+_rc=""
+_tag=llvmorg-${_version}${_rc}
+pkgver=${_version}${_rc/-/}
 pkgrel=1
 pkgdesc="Fortran frontend for LLVM (mingw-w64)"
 arch=('any')
@@ -25,15 +28,21 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-clang-tools-extra"
                "${MINGW_PACKAGE_PREFIX}-gcc")
              )
 options=('!debug' 'strip')
-source=("https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}/flang-${pkgver}.src.tar.xz"{,.sig}
+source=("https://github.com/llvm/llvm-project/releases/download/${_tag}/flang-${pkgver}.src.tar.xz"{,.sig}
+        "https://github.com/llvm/llvm-project/releases/download/${_tag}/cmake-${pkgver}.src.tar.xz"{,.sig}
         "0001-cast-cxx11-narrowing.patch"
-        "0002-cmake-22162.patch")
-sha256sums=('e225b889c7188e693aea9dd4503c362be539b4b757e358fb7d659eddc470c7ba'
+        "0002-cmake-22162.patch"
+        "0003-do-not-link-to-llvm-dylib.patch")
+sha256sums=('f8bb477821fdd88967e195f247e24b674b36f5472a2562aeb284ac2af77a6b6d'
+            'SKIP'
+            '2a3096c6d00f8d2fc588243db1b6a8c283a31e28a02f7e4c435a9a27ccf88e8f'
             'SKIP'
             'ba08064d737a2aa173125e88c3900dce804220fb0562596b03130177c2139312'
-            '77fb0612217b6af7a122f586a9d0d334cd48bb201509bf72e8f8e6244616e895')
+            '77fb0612217b6af7a122f586a9d0d334cd48bb201509bf72e8f8e6244616e895'
+            '8d70b33d20d74801aeee82173944fed3b33ae185031537e1b50a640238f7a988')
 validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D'  # Hans Wennborg, Google.
-              '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard
+              '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard
+              'D574BD5D1D0E98895E3BF90044F2485E45D59042') # Tobias Hieta
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -44,11 +53,13 @@ apply_patch_with_msg() {
 }
 
 prepare() {
+  mv cmake-$pkgver.src cmake
   cd "${srcdir}/flang-${pkgver}.src"
 
   apply_patch_with_msg \
     "0001-cast-cxx11-narrowing.patch" \
-    "0002-cmake-22162.patch"
+    "0002-cmake-22162.patch" \
+    "0003-do-not-link-to-llvm-dylib.patch"
 }
 
 build() {