From nobody Sat Dec 3 20:56:09 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 4NPhtK3K7Bz4jPyY; Sat, 3 Dec 2022 20:56:09 +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 4NPhtK2k8Rz3FHX; Sat, 3 Dec 2022 20:56:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670100969; 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=N4ON03TV3H03sLHCntoWtnEsSofzguAAiPz7piMi8iY=; b=sBU28sQ4oAPSZ2kA0TBHsayRUvDHCslvrVPr9Y44VU5NlvI4OS05NxdFhPmNPO1yXzrMrF 5auMjYWo2tqfkg1hSCElOSLrkqbQeVSiTnFlXOPgV36yRdZvPwiQaPPZSTWy2ziZjnpkVx 20bMZeYRsYdkXzstROwA4Gwm27GHbI/kv3EIiGSEG8+SvlqdrN9JV8b3sP1e8ai5WpnEC4 4Cbyca7rQWCDeuLZw/ii+4Hxmh41p6C1XsYB4QxstQ7tKmfribBqpwwkX7efXp+rrL2uJN pyAcvO3oUvFoMgduZD4NGVH10h58CiOTgENFRFZVf8xZpiQZulVa56IgXgyRwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670100969; 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=N4ON03TV3H03sLHCntoWtnEsSofzguAAiPz7piMi8iY=; b=fM62LL9T3IJUAtrrjq5NHQIfnHrzt77c4+xciqzUy2RrLnZbIiDZZN6X4TUfyCIXTgBea9 S9dtWFpmuE7ic4DoY8lq9oz4QFIbm+QsYamgztcHJbq1KuFewGIgLsr8+QH8Is1YkPDrb+ MV3VMQw3DrB/fi///aa8jrcCgVCZQMayi4EI3w6otRn5uqDCr0Wma3OAkw+9CTdQPLx6s/ GagAMoLLBJmQa4/v2QyuUdQ1PBHw/WVDZ56RIs7w4P/q0Dfa2Jt+IpqGkUx3jcEAJmQFgh atmxuRvejyUidJ+/gzR1+Ra4M2hFaPBpo6mswndblTIx87arxHF3wDFg81ePvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670100969; a=rsa-sha256; cv=none; b=VDhVd8EgMzRvgUcsAZwaUoiPous2hpHb++E8OiUo87Zv+/dTPdyne7jn7XOJ/bK1/HzX4y dLs/D7MB4dB5R9GOo83BJlEkjNH1iWCUm/xPscEnmiw1ms5Mwpc4jXbIJgAo4ssB99//+m kjtaNK0Yc8W13R6EqjMw1Ite8pSZd15MIqNx3NEDUtO7LhSIQ5862Ar94l8hJS1OvgmMve iJeEkMZvhmb8BC+/z7RhhYOiPYQPnp+S1CwxMx/UoUmJL3BJA2+lvcPd38b7MO4VKnYJqY 9fZIOxHgQsI9FepussPIssG/FQmwHeI4fo258KpIMzIPDmKuEd7lxDuNmkN8Dw== 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 4NPhtK1gvVz183G; Sat, 3 Dec 2022 20:56:09 +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 2B3Ku93M020203; Sat, 3 Dec 2022 20:56:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B3Ku9kl020202; Sat, 3 Dec 2022 20:56:09 GMT (envelope-from git) Date: Sat, 3 Dec 2022 20:56:09 GMT Message-Id: <202212032056.2B3Ku9kl020202@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=20Apestegu=C3=ADa?= Subject: git: 57fd8dc61847 - 2022Q4 - lang/julia: unbrake after update of math/suitesparse-cholmod 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/2022Q4 X-Git-Reftype: branch X-Git-Commit: 57fd8dc618470cea89caa052364dda8e5694c670 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=57fd8dc618470cea89caa052364dda8e5694c670 commit 57fd8dc618470cea89caa052364dda8e5694c670 Author: Eric Reardon AuthorDate: 2022-12-02 06:58:10 +0000 Commit: Fernando Apesteguía CommitDate: 2022-12-03 20:51:57 +0000 lang/julia: unbrake after update of math/suitesparse-cholmod Looks like julia is incompatible with the latest version of suitesparse-cholmod. suitesparse is an optional dependency so remove it for now and will add it back when a version of julia that is compatible with it is released. PR: 268025 Reported by: rizor.reardon@yahoo.com (maintainer) (cherry picked from commit 8a3c1b4542340f4ac480a55ce225b10f10238436) --- lang/julia/Makefile | 50 +++++++++++++++++++++++--------------------------- lang/julia/pkg-plist | 8 -------- 2 files changed, 23 insertions(+), 35 deletions(-) diff --git a/lang/julia/Makefile b/lang/julia/Makefile index 3429e5ba5a28..0419db24ea29 100644 --- a/lang/julia/Makefile +++ b/lang/julia/Makefile @@ -1,7 +1,7 @@ PORTNAME= julia DISTVERSION= 1.8.3 DISTVERSIONSUFFIX= -full -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -37,22 +37,11 @@ USES= gmake compiler:c++14-lang cpe fortran python perl5 \ CPE_VENDOR= julialang -BINARY_ALIAS= python3=${PYTHON_CMD} gfortran=gfortran${_GCC_VER} USE_CXXSTD= c++14 USE_LDCONFIG= yes -CFLAGS+= -fpic SHEBANG_GLOB= *.sh -WRKSRC= ${WRKDIR}/julia-${DISTVERSION} - -ALL_TARGET= default -INSTALL_TARGET= install -TEST_TARGET= test - -PORTDOCS= html -PLIST_SUB= VERSION="${PORTVERSION:R}" - MAKE_ARGS+= NO_GIT=1 \ USE_BINARYBUILDER=0 \ prefix=${PREFIX} \ @@ -77,26 +66,33 @@ MAKE_ARGS+= NO_GIT=1 \ USE_SYSTEM_CSL=1 \ USE_SYSTEM_ZLIB=1 \ USE_SYSTEM_LIBUNWIND=1 +ALL_TARGET= default +INSTALL_TARGET= install +TEST_TARGET= test -OPTIONS_DEFINE= DEBUG DOCS NATIVE GPL_LIBS -OPTIONS_DEFAULT= DOCS GPL_LIBS +CFLAGS+= -fpic + +BINARY_ALIAS= python3=${PYTHON_CMD} gfortran=gfortran${_GCC_VER} + +WRKSRC= ${WRKDIR}/julia-${DISTVERSION} + +PLIST_SUB= VERSION="${PORTVERSION:R}" +PORTDOCS= html + +OPTIONS_DEFINE= DEBUG DOCS NATIVE +OPTIONS_DEFAULT= DOCS OPTIONS_SUB= yes + +NATIVE_DESC= Build with native CPU JIT tuning +NATIVE_MAKE_ARGS= JULIA_CPU_TARGET=native + DEBUG_MAKE_ARGS= FORCE_ASSERTIONS=1 \ ALL_TARGET=all \ BUNDLE_DEBUG_LIBS=1 DOCS_VARS= INSTALL_TARGET+=install-docs -GPL_LIBS_DESC= Build with GPL library suitesparse -GPL_LIBS_LIB_DEPENDS= libspqr.so:math/suitesparse-spqr \ - libumfpack.so:math/suitesparse-umfpack -GPL_LIBS_MAKE_ARGS= USE_SYSTEM_LIBSUITESPARSE=1 \ - USE_GPL_LIBS=1 - -NATIVE_DESC= Build with native CPU JIT tuning -NATIVE_MAKE_ARGS= JULIA_CPU_TARGET=native - post-patch: echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME} build\"" >> ${WRKSRC}/Make.user # unset ARCH for auto-detection @@ -122,15 +118,12 @@ pre-install: post-install: # clean up for Pkg3.jl .for file in .codecov.yml .travis.yml appveyor.yml bors.toml .gitignore source-extracted *.orig - ${FIND} ${STAGEDIR}${PREFIX}/share/julia/ -name ${file} -delete + ${FIND} ${STAGEDIR}${PREFIX}/share/julia/ -name "${file}" -delete .endfor .for dir in Statistics SuiteSparse ArgTools Pkg Downloads LibCURL NetworkOptions Tar ${RM} -fr ${STAGEDIR}${PREFIX}/share/julia/stdlib/v${PORTVERSION:R}/${dir}/.github/ .endfor -post-install-DOCS-off: - ${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc - post-install-DEBUG-off: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/julia* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libjulia.so* @@ -138,4 +131,7 @@ post-install-DEBUG-off: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/julia/${bin} .endfor +post-install-DOCS-off: + ${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc + .include diff --git a/lang/julia/pkg-plist b/lang/julia/pkg-plist index d87b5b7f9832..6596f25a9c78 100644 --- a/lang/julia/pkg-plist +++ b/lang/julia/pkg-plist @@ -39,16 +39,11 @@ include/julia/uv/unix.h include/julia/uv/version.h lib/julia/libLLVM-13jl.so lib/julia/libLLVM.so -%%GPL_LIBS%%lib/julia/libamd.so lib/julia/libatomic.so.1 lib/julia/libblastrampoline.so lib/julia/libblastrampoline.so.5 lib/julia/libblastrampoline.so.5.0.2 -%%GPL_LIBS%%lib/julia/libcamd.so lib/julia/libccalltest.so -%%GPL_LIBS%%lib/julia/libccolamd.so -%%GPL_LIBS%%lib/julia/libcholmod.so -%%GPL_LIBS%%lib/julia/libcolamd.so lib/julia/libcurl.so lib/julia/libdSFMT.so lib/julia/libgcc_s.so.1 @@ -78,12 +73,9 @@ lib/julia/libopenblas.so lib/julia/libopenlibm.so lib/julia/libpcre2-8.so lib/julia/libquadmath.so.0 -%%GPL_LIBS%%lib/julia/libspqr.so lib/julia/libssh2.so lib/julia/libssp.so.0 lib/julia/libstdc++.so.6 -%%GPL_LIBS%%lib/julia/libsuitesparseconfig.so -%%GPL_LIBS%%lib/julia/libumfpack.so lib/julia/libuv.so lib/julia/libuv.so.2 lib/julia/libuv.so.2.0.0