lang/julia: Update to 1.9.1

PR:		271363
Reported by:	wen@
Approved by:	rizor.reardon@yahoo.com(maintainer)

3 files changed, 21 insertions, 31 deletions

diff --git a/lang/julia/files/patch-Make.inc b/lang/julia/files/patch-Make.inc
index fd922c9d5b94..f496531f6e90 100644
--- a/lang/julia/files/patch-Make.inc
+++ b/lang/julia/files/patch-Make.inc
@@ -1,15 +1,15 @@
---- Make.inc.orig	2022-12-23 22:14:27 UTC
+--- Make.inc.orig	2023-05-09 10:49:55 UTC
 +++ Make.inc
-@@ -251,7 +251,7 @@ libdir := $(prefix)/$(framework_currver)
- libexecdir := $(prefix)/$(framework_helpers)
- datarootdir := $(prefix)/$(framework_resources)
- docdir := $(prefix)/$(framework_documentation)
+@@ -268,7 +268,7 @@ docdir := $(datarootdir)/doc/julia
+ libexecdir := $(prefix)/libexec
+ datarootdir := $(prefix)/share
+ docdir := $(datarootdir)/doc/julia
 -mandir := $(datarootdir)/man
 +mandir := $(prefix)/man
  man1dir := $(mandir)/man1
- includedir := $(prefix)/$(framework_headers)
- sysconfdir := $(prefix)/$(framework_resources)
-@@ -279,7 +279,7 @@ build_depsbindir := $(build_prefix)/tools
+ includedir := $(prefix)/include
+ sysconfdir := $(prefix)/etc
+@@ -286,7 +286,7 @@ build_datarootdir := $(build_prefix)/share
  build_libdir := $(build_prefix)/lib
  build_libexecdir := $(build_prefix)/libexec
  build_datarootdir := $(build_prefix)/share
@@ -18,14 +18,3 @@
  build_man1dir := $(build_mandir)/man1
  build_includedir := $(build_prefix)/include
  build_sysconfdir := $(build_prefix)/etc
-@@ -500,8 +500,8 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions
- endif
- 
- ifeq ($(USECLANG),1)
--CC := $(CROSS_COMPILE)clang
--CXX := $(CROSS_COMPILE)clang++
-+CC ?= $(CROSS_COMPILE)clang
-+CXX ?= $(CROSS_COMPILE)clang++
- JCFLAGS := -std=gnu99 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
- # AArch64 needs this flag to generate the .eh_frame used by libunwind
- JCPPFLAGS := -fasynchronous-unwind-tables
diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile
index 57a8f3c81353..e339d0dd603e 100644
--- a/lang/julia/files/patch-Makefile
+++ b/lang/julia/files/patch-Makefile
@@ -1,15 +1,15 @@
---- Makefile.orig	2022-12-23 22:14:27 UTC
+--- Makefile.orig	2023-05-09 10:51:38 UTC
 +++ Makefile
-@@ -229,7 +229,7 @@ define stringreplace
+@@ -236,7 +236,7 @@ endef
  endef
  
  
 -install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html
 +install: $(build_depsbindir)/stringreplace
- ifeq ($(BUNDLE_DEBUG_LIBS),1)
- 	@$(MAKE) $(QUIET_MAKE) all
- else
-@@ -317,8 +317,6 @@ endif
+ 	@$(MAKE) $(QUIET_MAKE) $(JULIA_BUILD_MODE)
+ 	@for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(private_libexecdir); do \
+ 		mkdir -p $(DESTDIR)$$subdir; \
+@@ -339,8 +339,6 @@ endif
  	cp -R -L $(JULIAHOME)/base/* $(DESTDIR)$(datarootdir)/julia/base
  	cp -R -L $(JULIAHOME)/test/* $(DESTDIR)$(datarootdir)/julia/test
  	cp -R -L $(build_datarootdir)/julia/* $(DESTDIR)$(datarootdir)/julia
@@ -18,7 +18,7 @@
  	# Remove various files which should not be installed
  	-rm -f $(DESTDIR)$(datarootdir)/julia/base/version_git.sh
  	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
-@@ -328,12 +326,6 @@ endif
+@@ -350,12 +348,6 @@ endif
  	-rm -f $(DESTDIR)$(datarootdir)/julia/stdlib/$(VERSDIR)/*/build-checked
  	# Copy in beautiful new man page
  	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/
@@ -31,7 +31,7 @@
  
  	# Update RPATH entries and JL_SYSTEM_IMAGE_PATH if $(private_libdir_rel) != $(build_private_libdir_rel)
  ifneq ($(private_libdir_rel),$(build_private_libdir_rel))
-@@ -402,26 +394,15 @@ endif
+@@ -430,26 +422,16 @@ endif
  endif
  endif
  
@@ -45,7 +45,7 @@
 -	# don't set libgfortran's RPATH, it won't be able to find its friends on systems
 -	# that don't have the exact GCC port installed used for the build.
 -	for lib in $(DESTDIR)$(private_libdir)/libgfortran*$(SHLIB_EXT)*; do \
--		$(PATCHELF) --set-rpath '$$ORIGIN' $$lib; \
+-		$(PATCHELF) $(PATCHELF_SET_RPATH_ARG) '$$ORIGIN' $$lib; \
 -	done
 -endif
 -
@@ -55,6 +55,7 @@
  ifeq ($(DARWIN_FRAMEWORK),1)
  	$(MAKE) -C $(JULIAHOME)/contrib/mac/framework frameworknoinstall
  endif
++
 +install-docs:
 +	#Copy documentation
 +	cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
diff --git a/lang/julia/files/patch-stdlib_LibGit2__jll_src_LibGit2__jll.jl b/lang/julia/files/patch-stdlib_LibGit2__jll_src_LibGit2__jll.jl
index b7c277455f47..f704eded5503 100644
--- a/lang/julia/files/patch-stdlib_LibGit2__jll_src_LibGit2__jll.jl
+++ b/lang/julia/files/patch-stdlib_LibGit2__jll_src_LibGit2__jll.jl
@@ -1,10 +1,10 @@
---- stdlib/LibGit2_jll/src/LibGit2_jll.jl.orig	2022-11-21 00:23:36 UTC
+--- stdlib/LibGit2_jll/src/LibGit2_jll.jl.orig	2023-05-09 10:56:52 UTC
 +++ stdlib/LibGit2_jll/src/LibGit2_jll.jl
 @@ -23,7 +23,7 @@ else
  elseif Sys.isapple()
-     const libgit2 = "@rpath/libgit2.1.3.dylib"
+     const libgit2 = "@rpath/libgit2.1.5.dylib"
  else
--    const libgit2 = "libgit2.so.1.3"
+-    const libgit2 = "libgit2.so.1.5"
 +    const libgit2 = "libgit2.so"
  end