From nobody Tue May 03 02:34:44 2022 X-Original-To: dev-commits-ports-all@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 9C9B51ABBFBD; Tue, 3 May 2022 02:34:44 +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 4KskZD3zNkz4dNZ; Tue, 3 May 2022 02:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651545284; 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=n8MjYaT1u6DyHIXf4OV1xd/DN6Ngt/NROK7rBdP34dw=; b=iTFWrhBz7eK2VNks5QIXBTE5FCVkInsLkRDCs0nagclYFAN3lN+awOQ3l3AMAMDWqfZK5I rqjmi2E1d/7/+LeDWDsBac6fMoWrQBlAfG2qnxFV75Kxbysbs7mhm6U7HiI6UBpPbj8h9y Sb3Klc2jZuIfRvexaQajVvFbWEsGl+WVWrZqx7kglgtN72D8gJFkf89CTsFPXTOpzbWV8a Ec1zOoyGYZpdkJkfcIHOOR970uNoDTT5yNgUuNycZ0wDmxxewafuvE5ebkku/zJUVVig98 +waGiPZrxgn46bWmFcGzL05GKW6yl/Zro5jTlJjOQj+psDgbJ2H8i9pzUg1UqA== 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 6878415D4F; Tue, 3 May 2022 02:34:44 +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 2432Yi0N045973; Tue, 3 May 2022 02:34:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2432YiGr045972; Tue, 3 May 2022 02:34:44 GMT (envelope-from git) Date: Tue, 3 May 2022 02:34:44 GMT Message-Id: <202205030234.2432YiGr045972@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 7095cde0cd9d - main - science/cantera: Unbreak OCTAVE option List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7095cde0cd9d5cde379f4369b98c7090a06239a6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651545284; 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=n8MjYaT1u6DyHIXf4OV1xd/DN6Ngt/NROK7rBdP34dw=; b=wHAkyX4CIVlEmpT+FkPFje+EdlU/Uo2sSMlEqiT5wxCDabWTAmwiw6hHhy7WbjVO4kWaRL +i0GM2Q+yt6fD2HcefHP9/bNu4r86/dR9CcDVMaAKtt94MDRgqhCxJWt81RKeenEk8duJk caIVZ7CT3LPYG+WdVpgPI6g7N2DorlG09sogOP37RLWws9MmHNFHYgvQnKZmdtxRa+1D5q KeXKnwhYRdgrryeXGG2LefgXmPB9sciUHTvRaet1Vi5f46Xtb2qW4VcNrc1A57vxWW1SN2 7b8KUWmooQlOsCzfWPuzbGDPg2GVpV/RcncxGgXlCdyq+QpfevVbzumOqPAZdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651545284; a=rsa-sha256; cv=none; b=Bd6IfpomBoInpfeE/Fq5zLYFCU0XcgDYch/ooLuRxvWfel0fzkj2B99yS3IhErkqQiTZZM Kc6DVvrB2iJx2C4fO3MxIa7VMQVEvhVxChI7BchtXmwiSb84DwpwMR+rm1GwE1njhxU1jb HxgTq2x0jYl4L8RqEy7edvRMkfhwy/mgnach8hYkvjp0PoyDIEFKZEcQJr463cZZXKxt+/ XXAk9DsviBikbHW/VCM7Rrm77fDv+5TK7fieXISjxGhXmv1RDjLLWd6G8H7H3YDCMAMBSR a0HQWWkvCh1akSW2Z1hPkasJ9J/9zW/NPXpXH4vl8ZnWZML4ktVF0EkL/BxEfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=7095cde0cd9d5cde379f4369b98c7090a06239a6 commit 7095cde0cd9d5cde379f4369b98c7090a06239a6 Author: Yuri Victorovich AuthorDate: 2022-05-03 02:33:46 +0000 Commit: Yuri Victorovich CommitDate: 2022-05-03 02:34:42 +0000 science/cantera: Unbreak OCTAVE option --- science/cantera/Makefile | 7 +++++-- science/cantera/files/patch-SConstruct | 17 +++++++++++++++++ science/cantera/files/patch-src_matlab_SConscript | 14 +++----------- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/science/cantera/Makefile b/science/cantera/Makefile index 8afdca022e34..fecbcdeaf46b 100644 --- a/science/cantera/Makefile +++ b/science/cantera/Makefile @@ -42,10 +42,10 @@ OPTIONS_SUB= yes OCTAVE_DESC= Octave support OCTAVE_MAKE_ARGS= matlab_toolbox=y matlab_path=${LOCALBASE} -OCTAVE_CXXFLAGS= -I${LOCALBASE}/include/octave-6.4.0/octave +OCTAVE_CXXFLAGS= -I${LOCALBASE}/include/octave-${OCTAVE_VERSION}/octave OCTAVE_LIB_DEPENDS= liboctave.so:math/octave OCTAVE_SUB_FILES= pkg-message-octave -OCTAVE_BROKEN= Path set for 'matlab_path' is not correct. (https://github.com/Cantera/cantera/issues/1270) +.include "../../math/octave/Makefile.version" # for OCTAVE_VERSION PYTHON_USES= python:3.6+ PYTHON_USE= PYTHON=cython @@ -69,6 +69,9 @@ do-install: do-install-PYTHON-on: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cantera/_cantera.cpython-${PYTHON_VER:S/.//}.so +post-patch-OCTAVE-on: # adjust Octave version in SConscript (python styled os.environ['OCTAVE_VERSION'] somehow doesn't work for this) + @${REINPLACE_CMD} -e "s|, 'bin', 'glnx.*')|, 'lib', 'octave', '${OCTAVE_VERSION}')|" ${WRKSRC}/src/matlab/SConscript + post-install-OCTAVE-on: # adjust .mex file name @${MV} \ ${STAGEDIR}${PREFIX}/lib/cantera/matlab/toolbox/ctmethods.mexa64 \ diff --git a/science/cantera/files/patch-SConstruct b/science/cantera/files/patch-SConstruct index 0a31558a42b2..de5294d25f39 100644 --- a/science/cantera/files/patch-SConstruct +++ b/science/cantera/files/patch-SConstruct @@ -25,3 +25,20 @@ env["cantera_version"] = "2.6.0" # For use where pre-release tags are not permitted (MSI, sonames) +@@ -1673,11 +1676,11 @@ if env["matlab_toolbox"] == "y": + "SUNDIALS libraries and skip building the Matlab toolbox.") + sys.exit(1) + +- if not (os.path.isdir(matlab_path) and +- os.path.isdir(pjoin(matlab_path, "extern"))): +- logger.error( +- f"Path set for 'matlab_path' is not correct. Path was '{matlab_path}'") +- sys.exit(1) ++ #if not (os.path.isdir(matlab_path) and ++ # os.path.isdir(pjoin(matlab_path, "extern"))): ++ # logger.error( ++ # f"Path set for 'matlab_path' is not correct. Path was '{matlab_path}'") ++ # sys.exit(1) + + + # ********************************************** diff --git a/science/cantera/files/patch-src_matlab_SConscript b/science/cantera/files/patch-src_matlab_SConscript index 69adee147fa9..300ee07c6df6 100644 --- a/science/cantera/files/patch-src_matlab_SConscript +++ b/science/cantera/files/patch-src_matlab_SConscript @@ -1,6 +1,6 @@ ---- src/matlab/SConscript.orig 2021-09-17 15:33:57 UTC +--- src/matlab/SConscript.orig 2022-05-01 15:31:54 UTC +++ src/matlab/SConscript -@@ -42,13 +42,13 @@ elif localenv['OS'] == 'Darwin': +@@ -42,7 +42,7 @@ elif localenv['OS'] == 'Darwin': elif os.name == 'posix': linklibs = list(env['cantera_libs']) @@ -8,12 +8,4 @@ + linklibs += ['octave', 'octinterp'] + env['LIBM'] if localenv['OS_BITS'] == 64: -- matlab_libs = pjoin(localenv['matlab_path'], 'bin', 'glnxa64') -+ matlab_libs = pjoin(localenv['matlab_path'], 'lib', 'octave', '6.4.0') - mexSuffix = '.mexa64' - else: -- matlab_libs = pjoin(localenv['matlab_path'], 'bin', 'glnx86') -+ matlab_libs = pjoin(localenv['matlab_path'], 'lib', 'octave', '6.4.0') - mexSuffix = '.mexglx' - - linkflags.extend(['-Wl,--no-undefined', + matlab_libs = pjoin(localenv['matlab_path'], 'bin', 'glnxa64')