From nobody Wed Jun 1 16:31:48 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 481D11B4BB96; Wed, 1 Jun 2022 16:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LCvmj1bPNz3kFV; Wed, 1 Jun 2022 16:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654101109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CtIIXKwnyd3i61XQWYMcvKJxH7v896kF3rRC+gKREcU=; b=Csf/Y6egj5yFW8toNaRpFp+QRsWfUsvc2TLcSVHm1vowh9LLErSfGs4v0TgcSj/vwijQLO MCrUo+4s0nwkgzK4i4wtEiDXsrRtXNvm0BE2r5NatRIELfIa0tATAiAguJYltrNJzJfLGu yNkhOY6bsJVl+JNru+DF5DL/dKf3kv14dr+NE7q4WBj0D9TIL/Avr8dYTo4RfmeWiRXaB7 dDrPMMnOPqEGUUtETttYuS0ARmxxqZT+CXzYbKBwO712Mnrq4CSlecRXBzXAA9hfOryYrz wTuYqcmXOs1ZHaSGy0p8EiVTSLHivdZtXHB2iHdbG8KnhTFuwVLwAq9CxVLuaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 16ECE23478; Wed, 1 Jun 2022 16:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 251GVnKu011553; Wed, 1 Jun 2022 16:31:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 251GVmGD011552; Wed, 1 Jun 2022 16:31:48 GMT (envelope-from git) Date: Wed, 1 Jun 2022 16:31:48 GMT Message-Id: <202206011631.251GVmGD011552@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: a82b2847de01 - 2022Q2 - lang/julia: Update to 1.7.3 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: a82b2847de01b169947611f893bb342f0818cfcd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654101109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CtIIXKwnyd3i61XQWYMcvKJxH7v896kF3rRC+gKREcU=; b=mtJVv0DbYpwnSLha+xop/V2UJnPX/kuwOxSa2wK7nKU2iaKG2m11XtVTpuJKldTEs+eHB1 auW6qmXEx/TwrxbczJ4zwtTtYxTJZySOdWMWbZa3jgVwEvO1ZkIdsrYq5trSel2VIDhpVC HaZykC/HNBeZ3O5GPWJVkfeIvk5KXVnle9chNtMm2doN9b50DtL7k4HyBJPPVuiZADasVO tdbuInTS+Uj4Y+sOOuCPWrbJ13SMCZ/CKLzjscDhtL+P8XXK6xBFkL9YRNkVN6oOM5XuA8 pF2jn+Q5biJcfnb4VFQQquRKHlHxXCP8R2KlqRIpvl5GCPPGQvp2+SSnnhupoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654101109; a=rsa-sha256; cv=none; b=c4jJfd1SqcYxvkng/VQd+ArFpN7NbANl2Rr3NwaG3ND09lDQkTVI+qyHcChvTSIXPYeq80 cIzFbQsGJjB0Cyv6VK3/APSCwHfWT79EZzASxQXqeRUQ+5Jjq8HRD2WuWwQa+bU/Inp8ZQ /tMIn9iFWiSd/sbGl8AAZQy5thQwggxhSUqjew8Pgns0KS/Lm0yP+6jjlSq/IgwozJ8yiw 6kcrS/v3fjrmS7hP8NurCARfNH+9NSlNSUBRWnD+7QPJ6zcfFxVT7x1JE9CDFn+p9D0kmo lgcuIFpaNHwFaX/tppE78q1xR4bJIpfi3h8D7cf5Lq3FJIB503HVSytDbrLneA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=a82b2847de01b169947611f893bb342f0818cfcd commit a82b2847de01b169947611f893bb342f0818cfcd Author: Eric Reardon AuthorDate: 2022-05-31 05:05:10 +0000 Commit: Fernando Apesteguía CommitDate: 2022-06-01 16:28:50 +0000 lang/julia: Update to 1.7.3 ChangeLog: https://github.com/JuliaLang/julia/compare/v1.7.2...v1.7.3 PR: 264352 Reported by: rizor.reardon@yahoo.com (maintainer) (cherry picked from commit 6f22f6eb1bbd996d87ddf08a7b3d3f4a1168bcc1) --- lang/julia/Makefile | 11 +++-------- lang/julia/distinfo | 6 +++--- lang/julia/files/patch-Makefile | 4 ++-- lang/julia/files/patch-deps_llvm.mk | 11 +++++++++++ ...afcde9cf837a331fce023b31f1d3699700c_src_Curl_Multi.jl | 16 ---------------- lang/julia/files/patch-stdlib_Zlib__jll_src_Zlib__jll.jl | 11 +++++++++++ lang/julia/pkg-plist | 5 +---- 7 files changed, 31 insertions(+), 33 deletions(-) diff --git a/lang/julia/Makefile b/lang/julia/Makefile index a3f48476d009..3b7bcf5025e9 100644 --- a/lang/julia/Makefile +++ b/lang/julia/Makefile @@ -1,7 +1,7 @@ # Created by: Iblis Lin PORTNAME= julia -DISTVERSION= 1.7.2 +DISTVERSION= 1.7.3 DISTVERSIONSUFFIX= -full CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${DISTVERSION}/ @@ -74,6 +74,7 @@ MAKE_ARGS+= NO_GIT=1 \ USE_SYSTEM_BLAS=1 \ USE_SYSTEM_NGHTTP2=1 \ USE_SYSTEM_CSL=1 \ + USE_SYSTEM_ZLIB=1 \ USE_SYSTEM_LIBUNWIND=1 OPTIONS_DEFINE= DEBUG DOCS NATIVE GPL_LIBS @@ -95,12 +96,6 @@ GPL_LIBS_MAKE_ARGS= USE_SYSTEM_LIBSUITESPARSE=1 \ NATIVE_DESC= Build with native CPU JIT tuning NATIVE_MAKE_ARGS= MARCH=native -post-extract: - ${MKDIR} ${WRKSRC}/stdlib/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c/ - ${TAR} -C ${WRKSRC}/stdlib/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c/ --strip-components 1 \ - -xf ${WRKSRC}/stdlib/srccache/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c.tar.gz - echo "1" > ${WRKSRC}/stdlib/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c/source-extracted - post-patch: echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME} build\"" >> ${WRKSRC}/Make.user # unset ARCH for auto-detection @@ -135,7 +130,7 @@ post-install-DOCS-off: post-install-DEBUG-off: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/julia* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libjulia.so* -.for bin in libccalltest.so libllvmcalltest.so libjulia-internal.so* libblastrampoline.so libdSFMT.so libuv.so* libz.so* libLLVM* sys.so +.for bin in libccalltest.so libllvmcalltest.so libjulia-internal.so* libblastrampoline.so libdSFMT.so libuv.so* libLLVM* sys.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/julia/${bin} .endfor diff --git a/lang/julia/distinfo b/lang/julia/distinfo index 104b4279e12c..dd6153b55eec 100644 --- a/lang/julia/distinfo +++ b/lang/julia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644261836 -SHA256 (julia-1.7.2-full.tar.gz) = c1b4f1f75aac34c40e81805cba2d87f1e72f9ce1405a525273c3688eee12366f -SIZE (julia-1.7.2-full.tar.gz) = 255681484 +TIMESTAMP = 1653507008 +SHA256 (julia-1.7.3-full.tar.gz) = 4be529b0716de1ec48ba52e83a0fafd4be2269be9cc43074ad15ce788aeca093 +SIZE (julia-1.7.3-full.tar.gz) = 256584516 diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile index 1248a6e671cf..d294118b6f98 100644 --- a/lang/julia/files/patch-Makefile +++ b/lang/julia/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2021-11-30 12:13:06 UTC +--- Makefile.orig 2022-05-18 05:08:54 UTC +++ Makefile @@ -226,7 +226,7 @@ define stringreplace endef @@ -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)) -@@ -384,26 +376,15 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1) +@@ -386,26 +378,15 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1) endif endif diff --git a/lang/julia/files/patch-deps_llvm.mk b/lang/julia/files/patch-deps_llvm.mk new file mode 100644 index 000000000000..a8e5ad8efe61 --- /dev/null +++ b/lang/julia/files/patch-deps_llvm.mk @@ -0,0 +1,11 @@ +--- 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_Downloads-26d79afcde9cf837a331fce023b31f1d3699700c_src_Curl_Multi.jl b/lang/julia/files/patch-stdlib_Downloads-26d79afcde9cf837a331fce023b31f1d3699700c_src_Curl_Multi.jl deleted file mode 100644 index da0227e7c083..000000000000 --- a/lang/julia/files/patch-stdlib_Downloads-26d79afcde9cf837a331fce023b31f1d3699700c_src_Curl_Multi.jl +++ /dev/null @@ -1,16 +0,0 @@ ---- stdlib/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c/src/Curl/Multi.jl.orig 2021-10-26 22:48:36 UTC -+++ stdlib/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c/src/Curl/Multi.jl -@@ -142,12 +142,7 @@ function timer_callback( - )::Cint - multi = unsafe_pointer_to_objref(multi_p)::Multi - @assert multi_h == multi.handle -- if timeout_ms == 0 -- lock(multi.lock) do -- @check curl_multi_socket_action(multi.handle, CURL_SOCKET_TIMEOUT, 0) -- check_multi_info(multi) -- end -- elseif timeout_ms >= 0 -+ if timeout_ms >= 0 - timeout_cb = @cfunction(timeout_callback, Cvoid, (Ptr{Cvoid},)) - uv_timer_start(multi.timer, timeout_cb, max(1, timeout_ms), 0) - elseif timeout_ms == -1 diff --git a/lang/julia/files/patch-stdlib_Zlib__jll_src_Zlib__jll.jl b/lang/julia/files/patch-stdlib_Zlib__jll_src_Zlib__jll.jl new file mode 100644 index 000000000000..65523f1da6b4 --- /dev/null +++ b/lang/julia/files/patch-stdlib_Zlib__jll_src_Zlib__jll.jl @@ -0,0 +1,11 @@ +--- stdlib/Zlib_jll/src/Zlib_jll.jl.orig 2022-05-16 12:16:57 UTC ++++ stdlib/Zlib_jll/src/Zlib_jll.jl +@@ -22,7 +22,7 @@ if Sys.iswindows() + elseif Sys.isapple() + const libz = "@rpath/libz.1.dylib" + else +- const libz = "libz.so.1" ++ const libz = "libz.so" + end + + function __init__() diff --git a/lang/julia/pkg-plist b/lang/julia/pkg-plist index 767e20865788..8f5609de8d3b 100644 --- a/lang/julia/pkg-plist +++ b/lang/julia/pkg-plist @@ -79,9 +79,6 @@ lib/julia/libstdc++.so.6 lib/julia/libuv.so lib/julia/libuv.so.2 lib/julia/libuv.so.2.0.0 -lib/julia/libz.so -lib/julia/libz.so.1 -lib/julia/libz.so.1.2.11 %%DEBUG%%lib/julia/sys-debug.so lib/julia/sys.so %%DEBUG%%lib/libjulia-debug.so @@ -370,7 +367,7 @@ libexec/7z %%DATADIR%%/stdlib/v%%VERSION%%/Distributed/test/runtests.jl %%DATADIR%%/stdlib/v%%VERSION%%/Distributed/test/splitrange.jl %%DATADIR%%/stdlib/v%%VERSION%%/Distributed/test/topology.jl -%%DATADIR%%/stdlib/v%%VERSION%%/Downloads/.ci/change-uuid.jl +%%DATADIR%%/stdlib/v%%VERSION%%/Downloads/.ci/test_and_change_uuid.jl %%DATADIR%%/stdlib/v%%VERSION%%/Downloads/LICENSE %%DATADIR%%/stdlib/v%%VERSION%%/Downloads/Project.toml %%DATADIR%%/stdlib/v%%VERSION%%/Downloads/README.md