summaryrefslogtreecommitdiff
path: root/lang/julia/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/julia/files')
-rw-r--r--lang/julia/files/patch-Make.inc8
-rw-r--r--lang/julia/files/patch-Makefile12
-rw-r--r--lang/julia/files/patch-deps_llvm.mk11
-rw-r--r--lang/julia/files/patch-stdlib_LibGit2__jll_src_LibGit2__jll.jl8
-rw-r--r--lang/julia/files/patch-stdlib_LibGit2_src_types.jl12
-rw-r--r--lang/julia/files/patch-stdlib_MbedTLS__jll_src_MbedTLS__jll.jl10
-rw-r--r--lang/julia/files/patch-stdlib_OpenLibm__jll_src_OpenLibm__jll.jl8
7 files changed, 23 insertions, 46 deletions
diff --git a/lang/julia/files/patch-Make.inc b/lang/julia/files/patch-Make.inc
index 9eee322adcb4..9245bb1b8bc0 100644
--- a/lang/julia/files/patch-Make.inc
+++ b/lang/julia/files/patch-Make.inc
@@ -1,6 +1,6 @@
---- Make.inc.orig 2021-12-23 01:12:50 UTC
+--- Make.inc.orig 2022-11-21 01:55:42 UTC
+++ Make.inc
-@@ -243,7 +243,7 @@ libdir := $(prefix)/$(framework_currver)
+@@ -251,7 +251,7 @@ docdir := $(prefix)/$(framework_documentation)
libexecdir := $(prefix)/$(framework_helpers)
datarootdir := $(prefix)/$(framework_resources)
docdir := $(prefix)/$(framework_documentation)
@@ -9,7 +9,7 @@
man1dir := $(mandir)/man1
includedir := $(prefix)/$(framework_headers)
sysconfdir := $(prefix)/$(framework_resources)
-@@ -271,7 +271,7 @@ build_depsbindir := $(build_prefix)/tools
+@@ -279,7 +279,7 @@ build_datarootdir := $(build_prefix)/share
build_libdir := $(build_prefix)/lib
build_libexecdir := $(build_prefix)/libexec
build_datarootdir := $(build_prefix)/share
@@ -18,7 +18,7 @@
build_man1dir := $(build_mandir)/man1
build_includedir := $(build_prefix)/include
build_sysconfdir := $(build_prefix)/etc
-@@ -510,8 +510,8 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions
+@@ -498,8 +498,8 @@ ifeq ($(USECLANG),1)
endif
ifeq ($(USECLANG),1)
diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile
index d294118b6f98..b10c5bc24ccb 100644
--- a/lang/julia/files/patch-Makefile
+++ b/lang/julia/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2022-05-18 05:08:54 UTC
+--- Makefile.orig 2022-11-18 12:39:16 UTC
+++ Makefile
-@@ -226,7 +226,7 @@ define stringreplace
+@@ -229,7 +229,7 @@ endef
endef
@@ -9,7 +9,7 @@
ifeq ($(BUNDLE_DEBUG_LIBS),1)
@$(MAKE) $(QUIET_MAKE) all
else
-@@ -314,8 +314,6 @@ endif
+@@ -317,8 +317,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
-@@ -325,12 +323,6 @@ endif
+@@ -328,12 +326,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,12 +31,12 @@
# Update RPATH entries and JL_SYSTEM_IMAGE_PATH if $(private_libdir_rel) != $(build_private_libdir_rel)
ifneq ($(private_libdir_rel),$(build_private_libdir_rel))
-@@ -386,26 +378,15 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1)
+@@ -392,26 +384,15 @@ endif
endif
endif
-- # On FreeBSD, remove the build's libdir from each library's RPATH
-ifeq ($(OS),FreeBSD)
+- # On FreeBSD, remove the build's libdir from each library's RPATH
- $(JULIAHOME)/contrib/fixup-rpath.sh "$(PATCHELF)" $(DESTDIR)$(libdir) $(build_libdir)
- $(JULIAHOME)/contrib/fixup-rpath.sh "$(PATCHELF)" $(DESTDIR)$(private_libdir) $(build_libdir)
- $(JULIAHOME)/contrib/fixup-rpath.sh "$(PATCHELF)" $(DESTDIR)$(bindir) $(build_libdir)
diff --git a/lang/julia/files/patch-deps_llvm.mk b/lang/julia/files/patch-deps_llvm.mk
deleted file mode 100644
index a8e5ad8efe61..000000000000
--- a/lang/julia/files/patch-deps_llvm.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- deps/llvm.mk.orig 2022-05-18 05:08:54 UTC
-+++ deps/llvm.mk
-@@ -277,7 +277,7 @@ $(eval $(call LLVM_PATCH,llvm7-symver-jlprefix))
- endif
-
- # declare that all patches must be applied before running ./configure
--$(LLVM_BUILDDIR_withtype)/build-configured: | $(LLVM_PATCH_PREV) $(build_prefix)/manifest/zlib
-+$(LLVM_BUILDDIR_withtype)/build-configured: | $(LLVM_PATCH_PREV)
-
- $(LLVM_BUILDDIR_withtype)/build-configured: $(SRCCACHE)/$(LLVM_SRC_DIR)/source-extracted | $(llvm_python_workaround)
- mkdir -p $(dir $@)
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 7d0f202f880a..b7c277455f47 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 2021-11-29 02:21:22 UTC
+--- stdlib/LibGit2_jll/src/LibGit2_jll.jl.orig 2022-11-21 00:23:36 UTC
+++ stdlib/LibGit2_jll/src/LibGit2_jll.jl
-@@ -23,7 +23,7 @@ if Sys.iswindows()
+@@ -23,7 +23,7 @@ else
elseif Sys.isapple()
- const libgit2 = "@rpath/libgit2.1.1.dylib"
+ const libgit2 = "@rpath/libgit2.1.3.dylib"
else
-- const libgit2 = "libgit2.so.1.1"
+- const libgit2 = "libgit2.so.1.3"
+ const libgit2 = "libgit2.so"
end
diff --git a/lang/julia/files/patch-stdlib_LibGit2_src_types.jl b/lang/julia/files/patch-stdlib_LibGit2_src_types.jl
deleted file mode 100644
index 46ff7104388e..000000000000
--- a/lang/julia/files/patch-stdlib_LibGit2_src_types.jl
+++ /dev/null
@@ -1,12 +0,0 @@
---- stdlib/LibGit2/src/types.jl.orig 2021-12-15 04:07:40 UTC
-+++ stdlib/LibGit2/src/types.jl
-@@ -230,6 +230,9 @@ Matches the [`git_remote_callbacks`](https://libgit2.o
- push_update_reference::Ptr{Cvoid} = C_NULL
- push_negotiation::Ptr{Cvoid} = C_NULL
- transport::Ptr{Cvoid} = C_NULL
-+ @static if LibGit2.VERSION >= v"1.2.0"
-+ remote_ready::Ptr{Cvoid} = C_NULL
-+ end
- payload::Any = nothing
- @static if LibGit2.VERSION >= v"0.99.0"
- resolve_url::Ptr{Cvoid} = C_NULL
diff --git a/lang/julia/files/patch-stdlib_MbedTLS__jll_src_MbedTLS__jll.jl b/lang/julia/files/patch-stdlib_MbedTLS__jll_src_MbedTLS__jll.jl
index 70b82c6dd39a..c2486f73d59e 100644
--- a/lang/julia/files/patch-stdlib_MbedTLS__jll_src_MbedTLS__jll.jl
+++ b/lang/julia/files/patch-stdlib_MbedTLS__jll_src_MbedTLS__jll.jl
@@ -1,11 +1,11 @@
---- stdlib/MbedTLS_jll/src/MbedTLS_jll.jl.orig 2021-11-25 11:01:50 UTC
+--- stdlib/MbedTLS_jll/src/MbedTLS_jll.jl.orig 2022-11-21 01:45:43 UTC
+++ stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
-@@ -31,9 +31,9 @@ elseif Sys.isapple()
- const libmbedtls = "@rpath/libmbedtls.13.dylib"
+@@ -31,9 +31,9 @@ else
+ const libmbedtls = "@rpath/libmbedtls.14.dylib"
const libmbedx509 = "@rpath/libmbedx509.1.dylib"
else
-- const libmbedcrypto = "libmbedcrypto.so.5"
-- const libmbedtls = "libmbedtls.so.13"
+- const libmbedcrypto = "libmbedcrypto.so.7"
+- const libmbedtls = "libmbedtls.so.14"
- const libmbedx509 = "libmbedx509.so.1"
+ const libmbedcrypto = "libmbedcrypto.so"
+ const libmbedtls = "libmbedtls.so"
diff --git a/lang/julia/files/patch-stdlib_OpenLibm__jll_src_OpenLibm__jll.jl b/lang/julia/files/patch-stdlib_OpenLibm__jll_src_OpenLibm__jll.jl
index ff13a5ea86d2..4b198e28c35c 100644
--- a/lang/julia/files/patch-stdlib_OpenLibm__jll_src_OpenLibm__jll.jl
+++ b/lang/julia/files/patch-stdlib_OpenLibm__jll_src_OpenLibm__jll.jl
@@ -1,10 +1,10 @@
---- stdlib/OpenLibm_jll/src/OpenLibm_jll.jl.orig 2021-11-25 11:01:50 UTC
+--- stdlib/OpenLibm_jll/src/OpenLibm_jll.jl.orig 2022-11-21 01:47:29 UTC
+++ stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
-@@ -22,7 +22,7 @@ if Sys.iswindows()
+@@ -22,7 +22,7 @@ else
elseif Sys.isapple()
- const libopenlibm = "@rpath/libopenlibm.3.dylib"
+ const libopenlibm = "@rpath/libopenlibm.4.dylib"
else
-- const libopenlibm = "libopenlibm.so.3"
+- const libopenlibm = "libopenlibm.so.4"
+ const libopenlibm = "libopenlibm.so"
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 20:18:28 +0000