# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1607855324 -3600
# Node ID 1a766822f3acdab0177993620971f3afc6b51342
# Parent  ac27eba752afd6e91973b69af7b480fb389d2e8e
LLVM: Update to version 9.0.1.

* src/llvm.mk: Update version and checksum. Update dependency to Python 3.
  Make sure to use python built by MXE Octave.
* src/llvm-2-demangle.patch: Remove patch.
* dist-files.mk: Remove file from list.

diff -r ac27eba752af -r 1a766822f3ac dist-files.mk
--- a/dist-files.mk	Sun Dec 13 11:20:22 2020 +0100
+++ b/dist-files.mk	Sun Dec 13 11:28:44 2020 +0100
@@ -320,7 +320,6 @@
   libxshmfence.mk \
   libxslt.mk \
   llvm-1-llvm-config.patch \
-  llvm-2-demangle.patch \
   llvm.mk \
   log4cxx-1-gcc.4.4.patch \
   log4cxx-2-pkgconfig.patch \
diff -r ac27eba752af -r 1a766822f3ac src/llvm-2-demangle.patch
--- a/src/llvm-2-demangle.patch	Sun Dec 13 11:20:22 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-MicrosoftDemangleNodes.h uses `uint8_t` without including `<cstdint>` and
-`std::string` without including `<string>`.
-
-
-diff --git a/include/llvm/Demangle/MicrosoftDemangleNodes.h b/include/llvm/Demangle/MicrosoftDemangleNodes.h
---- a/include/llvm/Demangle/MicrosoftDemangleNodes.h
-+++ b/include/llvm/Demangle/MicrosoftDemangleNodes.h
-@@ -4,6 +4,8 @@
- #include "llvm/Demangle/Compiler.h"
- #include "llvm/Demangle/StringView.h"
- #include <array>
-+#include <cstdint>
-+#include <string>
-
- class OutputStream;
diff -r ac27eba752af -r 1a766822f3ac src/llvm.mk
--- a/src/llvm.mk	Sun Dec 13 11:20:22 2020 +0100
+++ b/src/llvm.mk	Sun Dec 13 11:28:44 2020 +0100
@@ -3,12 +3,12 @@
 
 PKG             := llvm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 8.0.1
-$(PKG)_CHECKSUM := 09964f9eabc364f221a3caefbdaea28557273b4a
+$(PKG)_VERSION  := 9.0.1
+$(PKG)_CHECKSUM := f7fcf3bd92d130784513c06efe6910f135372ce3
+$(PKG)_SUBDIR   := llvm-$($(PKG)_VERSION).src
 $(PKG)_FILE     := llvm-$($(PKG)_VERSION).src.tar.xz
-$(PKG)_SUBDIR   := llvm-$($(PKG)_VERSION).src
 $(PKG)_URL      := https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := build-python
+$(PKG)_DEPS     := build-python3
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://releases.llvm.org/download.html?' | \
@@ -17,12 +17,16 @@
     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
             mkdir '$(1)/.build' && cd '$(1)/.build' && cmake .. \
                 $($(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 \
@@ -66,6 +70,7 @@
         cd '$(1)/.build' && 'cmake' .. \
             $($(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 \