1 files changed, 15 insertions, 39 deletions
diff --git a/lang/julia/files/patch-deps_llvm.mk b/lang/julia/files/patch-deps_llvm.mk
index e1e097d3cb1f..6d0d01e56821 100644
--- a/lang/julia/files/patch-deps_llvm.mk
+++ b/lang/julia/files/patch-deps_llvm.mk
@@ -1,45 +1,21 @@
---- deps/llvm.mk.orig	2023-12-03 21:24:39 UTC
+--- deps/llvm.mk.orig	2024-04-30 17:45:14 UTC
 +++ deps/llvm.mk
-@@ -60,7 +60,10 @@ endif
- LLVM_ENABLE_PROJECTS := $(LLVM_ENABLE_PROJECTS);lld
- endif
- 
-+LLVM_BUILD_BENCHMARKS?=1
-+LLVM_INCLUDE_BENCHMARKS?=1
- 
-+
- LLVM_LIB_FILE := libLLVMCodeGen.a
- 
- # Figure out which targets to build
-@@ -76,6 +79,8 @@ LLVM_CMAKE += -DLLVM_ENABLE_RUNTIMES="$(LLVM_ENABLE_RU
- LLVM_CMAKE += -DLLVM_ENABLE_PROJECTS="$(LLVM_ENABLE_PROJECTS)"
- LLVM_CMAKE += -DLLVM_EXTERNAL_PROJECTS="$(LLVM_EXTERNAL_PROJECTS)"
- LLVM_CMAKE += -DLLVM_ENABLE_RUNTIMES="$(LLVM_ENABLE_RUNTIMES)"
-+LLVM_CMAKE += -DLLVM_ENABLE_BENCHMARKS="$(LLVM_ENABLE_BENCHMARKS)"
-+LLVM_CMAKE += -DLLVM_INCLUDE_BENCHMARKS="$(LLVM_INCLUDE_BENCHMARKS)"
- 
- ifeq ($(USE_RV),1)
- LLVM_CMAKE += -DLLVM_EXTERNAL_RV_SOURCE_DIR=$(LLVM_MONOSRC_DIR)/rv
-@@ -90,6 +95,9 @@ LLVM_LDFLAGS += $(LDFLAGS)
- LLVM_CXXFLAGS += $(CXXFLAGS)
- LLVM_CPPFLAGS += $(CPPFLAGS)
- LLVM_LDFLAGS += $(LDFLAGS)
-+LLVM_CFLAGS += -I$(SRCCACHE)/$(LLVM_SRC_DIR)/third-party/benchmark/include
-+LLVM_LDFLAGS += -L$(LLVM_BUILDDIR_withtype)/lib
-+LLVM_CPPFLAGS += -I$(SRCCACHE)/$(LLVM_SRC_DIR)/third-party/benchmark/include
- LLVM_CMAKE += -DLLVM_TARGETS_TO_BUILD:STRING="$(LLVM_TARGETS)" -DCMAKE_BUILD_TYPE="$(LLVM_CMAKE_BUILDTYPE)"
- LLVM_CMAKE += -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:STRING="$(LLVM_EXPERIMENTAL_TARGETS)"
- LLVM_CMAKE += -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_HOST_TRIPLE="$(or $(XC_HOST),$(BUILD_MACHINE))"
-@@ -231,6 +239,12 @@ $(eval $(call LLVM_PATCH,llvm-ittapi-cmake))
+@@ -214,7 +214,7 @@ $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied: $$(SRC
+ LLVM_PATCH_PREV :=
+ define LLVM_PATCH
+ $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied: $$(SRCCACHE)/$$(LLVM_SRC_DIR)/source-extracted | $$(SRCDIR)/patches/$1.patch $$(LLVM_PATCH_PREV)
+-	cd $$(SRCCACHE)/$$(LLVM_SRC_DIR)/llvm && patch -p1 -f < $$(SRCDIR)/patches/$1.patch
++	cd $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$2 && patch -p$3 -f < $$(SRCDIR)/patches/$1.patch
+ 	echo 1 > $$@
+ # declare that applying any patch must re-run the compile step
+ $$(LLVM_BUILDDIR_withtype)/build-compiled: $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied
+@@ -230,7 +230,8 @@ endef
+ LLVM_PATCH_PREV := $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied
  endef
  
- $(eval $(call LLVM_PATCH,llvm-ittapi-cmake))
-+
-+$(SRCCACHE)/$(LLVM_SRC_DIR)/verfix.patch-applied: $(SRCCACHE)/$(LLVM_SRC_DIR)/source-extracted $(LLVM_PATCH_VERSIONFIXES)
-+	cd $(SRCCACHE)/$(LLVM_SRC_DIR) && patch < $(LLVM_PATCH_VERSIONFIXES)
-+	echo 1 > $@
-+
-+$(LLVM_BUILDDIR_withtype)/build-configured: | $(SRCCACHE)/$(LLVM_SRC_DIR)/verfix.patch-applied
+-$(eval $(call LLVM_PATCH,llvm-ittapi-cmake))
++$(eval $(call LLVM_PATCH,llvm-ittapi-cmake,llvm,1))
++$(eval $(call LLVM_PATCH,llvm-version-fixes,.,0))
  
  ifeq ($(USE_SYSTEM_ZLIB), 0)
  $(LLVM_BUILDDIR_withtype)/build-configured: | $(build_prefix)/manifest/zlib