pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-cantera: scons related TODO handled and removed from TODO list



Module Name:	pkgsrc-wip
Committed By:	Mayuresh <mayuresh%acm.org@localhost>
Pushed By:	mayuresh
Date:		Mon Jan 13 23:01:03 2025 +0530
Changeset:	b2f002760373fa4cf5554eddbbd534e86989a46a

Modified Files:
	py-cantera/Makefile
	py-cantera/TODO

Log Message:
py-cantera: scons related TODO handled and removed from TODO list

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b2f002760373fa4cf5554eddbbd534e86989a46a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-cantera/Makefile | 9 ++++++++-
 py-cantera/TODO     | 6 ------
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs:
diff --git a/py-cantera/Makefile b/py-cantera/Makefile
index 6c9296f786..f27d06bc68 100644
--- a/py-cantera/Makefile
+++ b/py-cantera/Makefile
@@ -25,6 +25,12 @@ SCONS_BUILD_ARGS+=	sundials_include=${PREFIX}/include
 SCONS_BUILD_ARGS+=	sundials_libdir=${PREFIX}/lib
 SCONS_BUILD_ARGS+=	run_examples=no
 
+# pkgsrc assumes PREFIX to be a standard argument and adds it implicitly
+# This package uses prefix instead. So have to do the following
+.include "../../devel/scons4/build.mk"
+_SCONS_BUILD_ARGS:=	${_SCONS_BUILD_ARGS:NPREFIX=${PREFIX}}
+
+
 PKGCONFIG_OVERRIDE+=	platform/posix/cantera.pc.in
 
 DEPENDS+=	${PYPKGPREFIX}-packaging>0:../../devel/py-packaging
@@ -35,6 +41,7 @@ DEPENDS+=	sundials>=7.1.1:../../wip/sundials
 
 TOOL_DEPENDS+=	${PYPKGPREFIX}-pip>=0:../../devel/py-pip
 TOOL_DEPENDS+=	${PYPKGPREFIX}-ruamel-yaml>=0.18.6:../../devel/py-ruamel-yaml
+TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
 CHECK_RELRO=	no
 
@@ -45,7 +52,7 @@ CHECK_RELRO=	no
 .include "../../wip/sundials/buildlink3.mk"
 .include "../../textproc/yaml-cpp/buildlink3.mk"
 .include "../../textproc/fmtlib/buildlink3.mk"
-.include "../../devel/scons4/build.mk"
 .include "../../devel/googletest/buildlink3.mk"
 .include "../../lang/python/wheel.mk"
+.include "../../lang/${PYPACKAGE}/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-cantera/TODO b/py-cantera/TODO
index c3d7747fba..b00ae593e0 100644
--- a/py-cantera/TODO
+++ b/py-cantera/TODO
@@ -1,9 +1,3 @@
-Requires this in scons4/build.mk since PREFIX option is not supported. (Or
-commenting this line should be fine since we add prefix to build args in
-Makefile.) A systematic solution is needed for this.
-
-	_SCONS_BUILD_ARGS+=     prefix=${PREFIX}
-
 Following warning may be handled by building sundials with blas/lapack
 
 - WARNING: External BLAS/LAPACK has been specified for Cantera but SUNDIALS was built without this support. Cantera will use the slower default solver implementations included with SUNDIALS. You can resolve this warning by installing or building SUNDIALS with BLAS/LAPACK support.


Home | Main Index | Thread Index | Old Index