From nobody Wed Dec 29 11:40:16 2021 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 3C3AB1901E9E; Wed, 29 Dec 2021 11:40:17 +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 4JP8bN6p3Lz3Db4; Wed, 29 Dec 2021 11:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CABE124387; Wed, 29 Dec 2021 11:40:16 +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 1BTBeGcb074425; Wed, 29 Dec 2021 11:40:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BTBeGWU074418; Wed, 29 Dec 2021 11:40:16 GMT (envelope-from git) Date: Wed, 29 Dec 2021 11:40:16 GMT Message-Id: <202112291140.1BTBeGWU074418@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: b1bfd1f7b735 - main - lang/julia: Cosmetic changes. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1bfd1f7b735b59d81fa057f7432aea0186aeedb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640778017; 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=HEMd8gSagvSwSWHnPrGptrX9DMvMWpeyC6hkgIq0TB8=; b=fbSNb3eQxiYnGLTPU9Qda4lNea0Zf2cNBNiS7ZymGeP16lQ7CkviKWChP62v1u+ckbCGUG uAZJ5ulLYHpmlBFTgtAjqkpa2TC9oR5uHSLckayzeY+VTnQD0h5jta+R6PxJ8VfVbD/OMp jZ8CtMlC400mqzx8WryFJUYK+DHD0JMnZ2XVxoveQ2HttLIoxsln534sXNiL5tQCd9FgPS Y+aNX+ECOVPm3KC84uzPuKx7t/9USXZvnGVeN42jL69cEy8NXhHqNpa4gNG9gcmrLZbjVA S/wgpPgfR7gmuyc0fuiObVtR1h2Dn6w5psM+ijgrqPV+LN2giZMJaZyCv3O+WA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640778017; a=rsa-sha256; cv=none; b=uzjA70uvxWrW/Vvv0E33qhRuqog1gfigZCp0AjELb68jhHz4j1F+VXZC/yZNiCYRs48YG8 MVcEEakCEfKsAp2Qg4gTAxJzBFy+fUC77vVJmiu0yRcAFph3vCykOVDD0KbN7SO+D7UzPx zZiaHTlLux1v7g0HJAjv5P6no/GOEVzshdvZbk9ioxni7mdpVLBBC8RDZjaGnXM++HEOd0 kXkj3n/etQqAeQxtISW657Ie+Pn1tL+9qcqXKzkHAk8ZLnGN/b3oCyzLXCYuQes+TRiXJ9 GWDTClMNBEsmccPZfvH7HlXfG4Er/ziujEPUUkh2p2mBp2BVOh4xhNHhh2rEOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1bfd1f7b735b59d81fa057f7432aea0186aeedb commit b1bfd1f7b735b59d81fa057f7432aea0186aeedb Author: Gleb Popov AuthorDate: 2021-12-29 11:31:57 +0000 Commit: Gleb Popov CommitDate: 2021-12-29 11:39:58 +0000 lang/julia: Cosmetic changes. --- lang/julia/Makefile | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/lang/julia/Makefile b/lang/julia/Makefile index b4ebe4650b6b..348a70702340 100644 --- a/lang/julia/Makefile +++ b/lang/julia/Makefile @@ -12,12 +12,13 @@ COMMENT= Implementation of Julia, a language for technical computing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= Has not been ported to this platform for freebsd MY_DEPENDS= 7z:archivers/p7zip BUILD_DEPENDS= patchelf:sysutils/patchelf \ - cmake:devel/cmake ${MY_DEPENDS} + cmake:devel/cmake \ + ${MY_DEPENDS} LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libgmp.so:math/gmp \ @@ -31,7 +32,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libopenlibm.so:math/openlibm RUN_DEPENDS= ${MY_DEPENDS} -USES= gmake compiler:c++14-lang fortran python perl5 \ +USES= gmake compiler:c++14-lang fortran python perl5 \ shebangfix blaslapack:openblas BINARY_ALIAS= python3=${PYTHON_CMD} gfortran=gfortran${_GCC_VER} @@ -40,13 +41,13 @@ CFLAGS+= -fpic SHEBANG_GLOB= *.sh -WRKSRC= ${WRKDIR}/julia-${DISTVERSION} -MANDIRS+= ${PREFIX}/share/man/man1 +WRKSRC= ${WRKDIR}/julia-${DISTVERSION} ALL_TARGET= default INSTALL_TARGET= install TEST_TARGET= test +PORTDOCS= html PLIST_SUB= VERSION="${PORTVERSION:R}" CXXFLAGS+= -std=c++14 @@ -73,32 +74,31 @@ MAKE_ARGS+= NO_GIT=1 \ USE_SYSTEM_CSL=1 \ USE_SYSTEM_LIBUNWIND=1 -OPTIONS_DEFINE= DEBUG DOCS NATIVE GPL_LIBS +OPTIONS_DEFINE= DEBUG DOCS NATIVE GPL_LIBS OPTIONS_DEFAULT= DOCS GPL_LIBS -OPTIONS_SUB= yes -DEBUG_MAKE_ARGS+= FORCE_ASSERTIONS=1 \ +OPTIONS_SUB= yes + +DEBUG_MAKE_ARGS= FORCE_ASSERTIONS=1 \ ALL_TARGET=all \ BUNDLE_DEBUG_LIBS=1 -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} -PORTDOCS= html -DOCS_VARS= INSTALL_TARGET+=install-docs +DOCS_VARS= INSTALL_TARGET+=install-docs -GPL_LIBS_DESC= Build with GPL lib: SUITESPARSE -GPL_LIBS_LIB_DEPENDS= libspqr.so:math/suitesparse-spqr \ - libumfpack.so:math/suitesparse-umfpack +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 + USE_GPL_LIBS=1 NATIVE_DESC= Build with native CPU JIT tuning -NATIVE_MAKE_ARGS+= MARCH=native +NATIVE_MAKE_ARGS= MARCH=native post-patch: echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME} build\"" >> ${WRKSRC}/Make.user # unset ARCH for auto-detection # Julia build script uses the name x86_86/x86, which are different from ports framework echo "ARCH=" >> ${WRKSRC}/Make.user - echo "LIBBLAS= -lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user + echo "LIBBLAS=-lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user @@ -111,8 +111,6 @@ post-configure: ) || ( \ echo "USE_BLAS64=0" >> ${WRKSRC}/Make.user \ ) -do-install-DOCS-off: - ${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc post-install: # clean up for Pkg3.jl @@ -122,6 +120,11 @@ post-install: .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* .for bin in libccalltest.so libllvmcalltest.so libjulia-internal.so* libblastrampoline.so libdSFMT.so libuv.so* libz.so* libLLVM* sys.so