From 8d418e4076167843393f6b5f5550f44d0a597f9d Mon Sep 17 00:00:00 2001
From: Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>
Date: Sun, 30 Aug 2020 00:24:39 -0400
Subject: [PATCH] julia: update to 1.5.1.

Patch was incorporated into upstrea.
---
 srcpkgs/julia/patches/36697.diff | 104 -------------------------------
 srcpkgs/julia/template           |   4 +-
 2 files changed, 2 insertions(+), 106 deletions(-)
 delete mode 100644 srcpkgs/julia/patches/36697.diff

diff --git a/srcpkgs/julia/patches/36697.diff b/srcpkgs/julia/patches/36697.diff
deleted file mode 100644
index f0c84d548e3..00000000000
--- a/srcpkgs/julia/patches/36697.diff
+++ /dev/null
@@ -1,104 +0,0 @@
-This patch was taken from <https://github.com/JuliaLang/julia/pull/36697>
-to workaround julia 1.5.0 not building correctly with musl libc.
-
-diff --git Make.inc Make.inc
-index e91461514463..21a0299318b5 100644
---- Make.inc
-+++ Make.inc
-@@ -940,17 +940,17 @@ LIBUNWIND:=
- else
- ifeq ($(USE_SYSTEM_LIBUNWIND), 1)
- ifneq ($(OS),Darwin)
--LIBUNWIND:=-lunwind-generic -lunwind
-+LIBUNWIND:=-lunwind
- # Only for linux since we want to use not yet released libunwind features
- JCFLAGS+=-DSYSTEM_LIBUNWIND
- JCPPFLAGS+=-DSYSTEM_LIBUNWIND
- endif
- else
- ifeq ($(OS),Darwin)
--LIBUNWIND:=$(build_libdir)/libosxunwind.a
-+LIBUNWIND:=-losxunwind
- JCPPFLAGS+=-DLIBOSXUNWIND
- else
--LIBUNWIND:=$(build_libdir)/libunwind-generic.a $(build_libdir)/libunwind.a
-+LIBUNWIND:=-lunwind
- endif
- endif
- endif
-@@ -1206,12 +1206,12 @@ OSLIBS += -lelf -lkvm -lrt -lpthread
- OSLIBS += -lgcc_s
- 
- OSLIBS += -Wl,--export-dynamic -Wl,--version-script=$(JULIAHOME)/src/julia.expmap \
--	$(NO_WHOLE_ARCHIVE) $(LIBUNWIND)
-+	$(NO_WHOLE_ARCHIVE)
- endif
- 
- ifeq ($(OS), Darwin)
- SHLIB_EXT := dylib
--OSLIBS += -framework CoreFoundation $(LIBUNWIND)
-+OSLIBS += -framework CoreFoundation
- WHOLE_ARCHIVE := -Xlinker -all_load
- NO_WHOLE_ARCHIVE :=
- JLDFLAGS :=
-diff --git Makefile Makefile
-index 96f58b9aec4e..23d1bd5208f7 100644
---- Makefile
-+++ Makefile
-@@ -181,6 +181,11 @@ endif
- ifeq ($(USE_LLVM_SHLIB),1)
- JL_PRIVATE_LIBS-$(USE_SYSTEM_LLVM) += libLLVM libLLVM-9jl
- endif
-+ifeq ($(OS),Darwin)
-+JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBUNWIND) += libosxunwind
-+else
-+JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBUNWIND) += libunwind
-+endif
- 
- ifeq ($(USE_SYSTEM_LIBM),0)
- JL_PRIVATE_LIBS-$(USE_SYSTEM_OPENLIBM) += libopenlibm
-diff --git deps/Makefile deps/Makefile
-index e6a975ba1873..90e231f30e85 100644
---- deps/Makefile
-+++ deps/Makefile
-@@ -157,7 +157,11 @@ ifneq ($(OS), WINNT)
- DEP_LIBS += libwhich
- endif
- 
--DEP_LIBS_STAGED := $(filter-out suitesparse-wrapper osxunwind,$(DEP_LIBS)) # unlist targets that have not been converted to use the staged-install
-+# unlist targets that have not been converted to use the staged-install
-+DEP_LIBS_STAGED := $(filter-out suitesparse-wrapper,$(DEP_LIBS))
-+ifneq ($(USE_BINARYBUILDER_LIBUNWIND),1)
-+DEP_LIBS_STAGED := $(filter-out osxunwind,$(DEP_LIBS))
-+endif
- 
- 
- ## Common build target prefixes
-diff --git deps/unwind.mk deps/unwind.mk
-index f44917c28981..08d8990a720e 100644
---- deps/unwind.mk
-+++ deps/unwind.mk
-@@ -109,7 +109,7 @@ UNWIND_BB_NAME := LibUnwind.v$(UNWIND_VER)
- 
- $(eval $(call bb-install,unwind,UNWIND,false))
- 
--OSXUNWIND_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibOSXUnwind-$(OSXUNWIND_VER)-$(OSXUNWIND_BB_REL)
-+OSXUNWIND_BB_URL_BASE := https://github.com/JuliaBinaryWrappers/LibOSXUnwind_jll.jl/releases/download/LibOSXUnwind-v$(OSXUNWIND_VER)+$(OSXUNWIND_BB_REL)
- OSXUNWIND_BB_NAME := LibOSXUnwind.v$(OSXUNWIND_VER)
- 
- $(eval $(call bb-install,osxunwind,OSXUNWIND,false))
-diff --git src/Makefile src/Makefile
-index 3153c0178d0a..7d8db3740209 100644
---- src/Makefile
-+++ src/Makefile
-@@ -120,7 +120,7 @@ CLANG_LDFLAGS += -Wl,-undefined,dynamic_lookup
- endif
- 
- 
--COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS) $(LIBUNWIND)
-+COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LIBUNWIND) $(LLVMLINK) $(OSLIBS)
- DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
- RELEASE_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport.a $(COMMON_LIBS)
- 
-
-
diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 36160270062..2a82af060e4 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -1,6 +1,6 @@
 # Template file for 'julia'
 pkgname=julia
-version=1.5.0
+version=1.5.1
 revision=1
 archs="i686* x86_64* armv7l* aarch64*"
 build_style=gnu-makefile
@@ -27,7 +27,7 @@ maintainer="Adam Beckmeyer <adam_git@thebeckmeyers.xyz>"
 license="MIT"
 homepage="https://julialang.org"
 distfiles="https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"
-checksum=4a6ffadc8dd04ca0b7fdef6ae203d0af38185e57b78f7c0b972c4707354a6d1b
+checksum=1d0debfccfc7cd07047aa862dd2b1a96f7438932da1f5feff6c1033a63f9b1d4
 nocross="build system is a mess"
 # Targets for the vendored symlinks mentioned above
 shlib_requires="libgit2.so.1.0 libcurl.so.4 libmpfr.so.6 libgmp.so.10