# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1626712651 -7200
# Node ID 76a8a2d86ab8c50111c140a9f30e8d7ccdd8d641
# Parent  03d277ae2605bc3da4c7f50e752a5c7bd506090e
LLVM: Update to version 12.0.1.

* src/llvm.mk: Update version and checksum. Remove unused cmake flag.
* src/llvm-1-llvm-config.patch: Update patch.

diff -r 03d277ae2605 -r 76a8a2d86ab8 src/llvm-1-llvm-config.patch
--- a/src/llvm-1-llvm-config.patch	Thu Jul 15 12:37:28 2021 -0400
+++ b/src/llvm-1-llvm-config.patch	Mon Jul 19 18:37:31 2021 +0200
@@ -17,11 +17,10 @@
  /* Major version of the LLVM API */
  #define LLVM_VERSION_MAJOR ${LLVM_VERSION_MAJOR}
  
-diff --git "a/tools/llvm-config/llvm-config.cpp" "b/tools/llvm-config/llvm-config.cpp"
-index bec89fe..a1be375 100644
---- "a/tools/llvm-config/llvm-config.cpp"	
-+++ "b/tools/llvm-config/llvm-config.cpp"
-@@ -37,7 +37,12 @@ using namespace llvm;
+diff -up "./tools/llvm-config/llvm-config.cpp.orig" "./tools/llvm-config/llvm-config.cpp"
+--- ./tools/llvm-config/llvm-config.cpp.orig	2021-06-28 18:23:38.000000000 +0200
++++ ./tools/llvm-config/llvm-config.cpp	2021-07-19 17:23:35.059439097 +0200
+@@ -36,7 +36,12 @@ using namespace llvm;
  
  // Include the build time variables we can report to the user. This is generated
  // at build time from the BuildVariables.inc.in file by the build system.
@@ -35,9 +34,9 @@
  
  // Include the component table. This creates an array of struct
  // AvailableComponent entries, which record the component name, library name,
-@@ -352,14 +352,16 @@ int main(int argc, char **argv) {
-   StringRef SharedExt, SharedVersionedExt, SharedDir, SharedPrefix, StaticExt,
-       StaticPrefix, StaticDir = "lib", DirSep = "/";
+@@ -377,15 +382,17 @@ int main(int argc, char **argv) {
+       StaticPrefix, StaticDir = "lib";
+   std::string DirSep = "/";
    const Triple HostTriple(Triple::normalize(LLVM_HOST_TRIPLE));
 -  if (HostTriple.isOSWindows()) {
 +  const Triple TargetTriple(Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE));
@@ -46,6 +45,7 @@
      SharedVersionedExt = LLVM_DYLIB_VERSION ".dll";
 -    if (HostTriple.isOSCygMing()) {
 +    if (TargetTriple.isOSCygMing()) {
+       SharedPrefix = "lib";
        StaticExt = "a";
        StaticPrefix = "lib";
      } else {
@@ -54,7 +54,7 @@
        DirSep = "\\";
        std::replace(ActiveObjRoot.begin(), ActiveObjRoot.end(), '/', '\\');
        std::replace(ActivePrefix.begin(), ActivePrefix.end(), '/', '\\');
-@@ -368,10 +370,11 @@ int main(int argc, char **argv) {
+@@ -394,10 +401,11 @@ int main(int argc, char **argv) {
        std::replace(ActiveCMakeDir.begin(), ActiveCMakeDir.end(), '/', '\\');
        std::replace(ActiveIncludeOption.begin(), ActiveIncludeOption.end(), '/',
                     '\\');
@@ -67,7 +67,7 @@
      SharedExt = "dylib";
      SharedVersionedExt = LLVM_DYLIB_VERSION ".dylib";
      StaticExt = "a";
-@@ -670,7 +673,7 @@ int main(int argc, char **argv) {
+@@ -694,7 +703,7 @@ int main(int argc, char **argv) {
          } else if (PrintLibs) {
            // On Windows, output full path to library without parameters.
            // Elsewhere, if this is a typical library name, include it using -l.
diff -r 03d277ae2605 -r 76a8a2d86ab8 src/llvm.mk
--- a/src/llvm.mk	Thu Jul 15 12:37:28 2021 -0400
+++ b/src/llvm.mk	Mon Jul 19 18:37:31 2021 +0200
@@ -3,8 +3,8 @@
 
 PKG             := llvm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 11.0.1
-$(PKG)_CHECKSUM := 1a911295260d4e41116b72788eb602702b4bb252
+$(PKG)_VERSION  := 12.0.1
+$(PKG)_CHECKSUM := 619fe668e0972d11d0fa2db670a57a42d02fb8ca
 $(PKG)_SUBDIR   := llvm-$($(PKG)_VERSION).src
 $(PKG)_FILE     := llvm-$($(PKG)_VERSION).src.tar.xz
 $(PKG)_URL      := https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -17,9 +17,6 @@
     head -1
 endef
 
-$(PKG)_CMAKE_PYTHON_FLAGS := \
-    -DPYTHON_EXECUTABLE:FILEPATH='$(ROOT_PREFIX)/bin/python3'
-
 ifeq ($(MXE_NATIVE_BUILD),yes)
     ifeq ($(MXE_SYSTEM),gnu-linux)
         define $(PKG)_BUILD
@@ -27,7 +24,6 @@
                 -GNinja \
                 $($(PKG)_CMAKE_FLAGS) \
                 $(CMAKE_CCACHE_FLAGS) \
-                $($(PKG)_CMAKE_PYTHON_FLAGS) \
                 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
                 -DLLVM_BUILD_LLVM_DYLIB=ON \
                 -DLLVM_LINK_LLVM_DYLIB=ON \
@@ -72,7 +68,6 @@
             -GNinja \
             $($(PKG)_CMAKE_FLAGS) \
             $(CMAKE_CCACHE_FLAGS) \
-            $($(PKG)_CMAKE_PYTHON_FLAGS) \
             -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
             -DLLVM_BUILD_TOOLS=OFF \
             -DLLVM_BUILD_LLVM_DYLIB=ON \
@@ -104,7 +99,7 @@
         cd '$(1)/.build' && DESTDIR=$(3) ninja -j $(JOBS) install
 
         # create symlink for shared library so that llvm-config can find it
-        cd '$(3)/$(HOST_BINDIR)' && ln -s LLVM.dll LLVM-$(word 1,$(subst ., ,$($(PKG)_VERSION))).dll
+        cd '$(3)/$(HOST_BINDIR)' && ln -s libLLVM.dll LLVM-$(word 1,$(subst ., ,$($(PKG)_VERSION))).dll
 
         # install native llvm-config in HOST_BINDIR because it won't find the libs otherwise
         $(INSTALL) -d '$(HOST_BINDIR)'