From b39993b24811cf54a2e2bcb32dfd375921f08a39 Mon Sep 17 00:00:00 2001
From: Benjamin Lorenz <benlorenz@users.noreply.github.com>
Date: Wed, 4 Oct 2023 14:28:26 +0200
Subject: [PATCH] [libjulia] bump for julia-1.10.0-beta3 (#7484)

---
 L/libjulia/build_tarballs.jl                      |  2 +-
 .../bundled/patches/1.11.0-DEV/nonative.patch     | 15 ---------------
 L/libjulia/common.jl                              | 13 +++++++++----
 3 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 L/libjulia/bundled/patches/1.11.0-DEV/nonative.patch

diff --git a/L/libjulia/build_tarballs.jl b/L/libjulia/build_tarballs.jl
index 6d5ac072857..a05e79665f2 100644
--- a/L/libjulia/build_tarballs.jl
+++ b/L/libjulia/build_tarballs.jl
@@ -31,7 +31,7 @@ function Pkg.Types.is_stdlib(uuid::Base.UUID, julia_version::VersionNumber)
     return false
 end
 
-jllversion=v"1.10.5"
+jllversion=v"1.10.6"
 for ver in julia_full_versions
     build_julia(ARGS, ver; jllversion)
 end
diff --git a/L/libjulia/bundled/patches/1.11.0-DEV/nonative.patch b/L/libjulia/bundled/patches/1.11.0-DEV/nonative.patch
deleted file mode 100644
index 1cfacb921a8..00000000000
--- a/L/libjulia/bundled/patches/1.11.0-DEV/nonative.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Make.inc b/Make.inc
-index d5965ee4f4..8dc96eeff5 100644
---- a/Make.inc
-+++ b/Make.inc
-@@ -898,8 +898,8 @@ ISX86:=0
- endif
- 
- 
--#If nothing is set default to native
--ifeq ($(MARCH)$(MCPU)$(MTUNE)$(JULIA_CPU_TARGET),)
-+#If nothing is set default to native unless we are cross-compiling
-+ifeq ($(MARCH)$(MCPU)$(MTUNE)$(JULIA_CPU_TARGET)$(XC_HOST),)
- ifeq ($(ARCH),aarch64) #ARM recommends only setting MCPU for AArch64
- MCPU=native
- else
diff --git a/L/libjulia/common.jl b/L/libjulia/common.jl
index 9489b25a860..70865e3325b 100644
--- a/L/libjulia/common.jl
+++ b/L/libjulia/common.jl
@@ -5,7 +5,7 @@ using BinaryBuilder, Pkg
 include("../../fancy_toys.jl") # for get_addable_spec
 
 # list of supported Julia versions
-julia_full_versions = [v"1.6.3", v"1.7.0", v"1.8.2", v"1.9.0", v"1.10.0-beta2", v"1.11.0-DEV"]
+julia_full_versions = [v"1.6.3", v"1.7.0", v"1.8.2", v"1.9.0", v"1.10.0-beta3", v"1.11.0-DEV"]
 if ! @isdefined julia_versions
     julia_versions = Base.thispatch.(julia_full_versions)
 end
@@ -50,14 +50,14 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
         v"1.9.0" => "48f4c8a7d5f33d0bc6ce24226df20ab49e385c2d0c3767ec8dfdb449602095b2",
     )
 
-    if version == v"1.10.0-beta2"
+    if version == v"1.10.0-beta3"
         sources = [
-            GitSource("https://github.com/JuliaLang/julia.git", "a468aa198d030bd77efd7cb3e4069684af622dcc"),
+            GitSource("https://github.com/JuliaLang/julia.git", "404750f8586d77a7d1832e0dfb1b1931fcf191ac"),
             DirectorySource("./bundled"),
         ]
     elseif version == v"1.11.0-DEV"
         sources = [
-            GitSource("https://github.com/JuliaLang/julia.git", "8e14322b5aa344639dd86bf9eabb84afe831fcba"),
+            GitSource("https://github.com/JuliaLang/julia.git", "a988992b9b5aea642ab0a7cf442bbcecc25cd536"),
             DirectorySource("./bundled"),
         ]
     else
@@ -294,6 +294,11 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
     # choose make targets which compile libjulia but don't try to build a sysimage
     MAKE_TARGET="julia-src-release julia-cli-release julia-src-debug julia-cli-debug"
 
+    # work around missing strtoll strtoull, see https://github.com/JuliaLang/julia/issues/48081
+    if [[ "${target}" == *mingw* ]]; then
+        make -C deps install-csl
+        cp /opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib/libmsvcrt.a ./usr/lib/libmsvcrt.a
+    fi
     # Start the actual build. We pass DSYMUTIL='true -ignore' to skip the
     # unnecessary step calling dsymutil, which in our cross compilation
     # environment results in a segfault.