From nobody Tue Jan 25 09:28:14 2022 X-Original-To: dev-commits-ports-main@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 28A9719715AA; Tue, 25 Jan 2022 09:28:15 +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 4JjhNZ5q7Dz4qwY; Tue, 25 Jan 2022 09:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643102895; 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=SQd+lUNXqhq5jiaVmQt/jrukE8+HSXEhYNalkoN4rTo=; b=vgY/DxriijlnZo2Lg4wYi9ASlPt1D66skUd16OokdGLxcGRIxF1YTX4k6HW9a2M0fVTt9Y hZY2ZNLjRE2IzXhXk7jRBR4Aix3JjV4G2UfZ25r5Ralp/FiVdyjhwCR9K8jpqvKNsXcDI7 rwcjoq30qXN/w05SeeNEV3jwlxgzQAKP7s2JKO5BeL4qLko8b4eXtyYyIHQ6S79NTuUld/ RQbYHerc59DjsgEwejk1JBsOT1mzjqMOrVd+kOfbDeWsmUW3byCuUM8Cw0usG0pI/VVF3G k1Kk1o8jf+nZ373/Y0SLbw05PlAKDbwixznEYd+hUoMiHiyhzxDhWuot59Jj2Q== 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 A2BEF272BA; Tue, 25 Jan 2022 09:28:14 +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 20P9SE2H072671; Tue, 25 Jan 2022 09:28:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P9SEUY072670; Tue, 25 Jan 2022 09:28:14 GMT (envelope-from git) Date: Tue, 25 Jan 2022 09:28:14 GMT Message-Id: <202201250928.20P9SEUY072670@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: 175c1f57e85c - main - lang/julia: unbreak build when using libcurl 7.81 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 175c1f57e85c9a0936731219240483df64c43691 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643102895; 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=SQd+lUNXqhq5jiaVmQt/jrukE8+HSXEhYNalkoN4rTo=; b=sX6Z5RlZ3M8+L5zKx754YGe9NNuWP2Zl1aHpXkaqgizPNQ1uliGPH6xdv1/lek8cAaL703 wrNrBpv2bVliTgJdXwczx5CyjUkVkGBaAL9NoxFeufRTEohyQu9alDUT0WMft2mLSb9abe KG44W2m3CL3Pg4O7sHtmOgbubI39XmixhahG+y5XxFUyR7JL/0UxykdlzsVH+HDyWleFAl g0DvcRALGQxu3uB2/DDv1Kn0Q9lWKsaij3RVEKN/TBu+yDZWmj0DaFRsPUBDsOpugc1bHt c6esIUjOGH1ByZPs8vY9V12SDLbkJzxrT8033/Ox/8tOii2qEs5NRm6U5z6ALA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643102895; a=rsa-sha256; cv=none; b=YZ36f7V0RR2r0LI780G3+30Eu3OBN0MVPyUPHMkNVOQALiVA+eT5NlV5QACJPePv4x5KuQ 4c1O7khjYcthTUk4nJ785Fv71PsRIf2UHzQaeRJg1bVqLSGEwl16vsjC3JyJao0sPWAE39 nX2fUcAE+oC54uKJo3O5K5wowkBttaJHeIyWvfEV0PHaa00O0y0Qds7Ihs1Ud5aixv70Dz f5V4uHW2UgxKzkbhgRfnz/a9bbZ8Njymsu6JyylIoMOIOBCfnGRlKlngkN8sWZmM8MGzP8 XIgSu2BumVzDf8cpLm+nubLPiUw/mUWXpVQ6buOxqXHWAFTt1f/d4fvYeKumKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=175c1f57e85c9a0936731219240483df64c43691 commit 175c1f57e85c9a0936731219240483df64c43691 Author: Eric Reardon AuthorDate: 2022-01-24 16:09:02 +0000 Commit: Fernando Apesteguía CommitDate: 2022-01-25 09:25:59 +0000 lang/julia: unbreak build when using libcurl 7.81 See: * https://github.com/JuliaLang/Downloads.jl/issues/172 * https://github.com/conda-forge/julia-feedstock/issues/169#issuecomment-1007411498 PR: 261417 Reported by: rizor.reardon@yahoo.com --- lang/julia/Makefile | 8 +++++++- ...afcde9cf837a331fce023b31f1d3699700c_src_Curl_Multi.jl | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/lang/julia/Makefile b/lang/julia/Makefile index cac210d03cf5..0ff9ee9d24a9 100644 --- a/lang/julia/Makefile +++ b/lang/julia/Makefile @@ -3,7 +3,7 @@ PORTNAME= julia DISTVERSION= 1.7.1 DISTVERSIONSUFFIX= -full -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${DISTVERSION}/ @@ -96,6 +96,12 @@ 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 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 new file mode 100644 index 000000000000..da0227e7c083 --- /dev/null +++ b/lang/julia/files/patch-stdlib_Downloads-26d79afcde9cf837a331fce023b31f1d3699700c_src_Curl_Multi.jl @@ -0,0 +1,16 @@ +--- 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