math/py-pynleq2: Remove dependency on flang.

This commit is contained in:
Yuri Victorovich 2021-02-14 18:12:28 +00:00
parent e6a37234ba
commit dddedc7f78
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=565258
3 changed files with 9 additions and 11 deletions

View file

@ -2,7 +2,7 @@
PORTNAME= pynleq2 PORTNAME= pynleq2
DISTVERSION= 0.0.2 DISTVERSION= 0.0.2
PORTREVISION= 5 PORTREVISION= 7
CATEGORIES= math python CATEGORIES= math python
MASTER_SITES= CHEESESHOP MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -16,12 +16,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYNUMPY} BUILD_DEPENDS= ${PYNUMPY}
USES= fortran:flang python:3.6+ USES= fortran python:3.6+
USE_PYTHON= distutils autoplist USE_PYTHON= distutils autoplist
USE_GITHUB= nodefault USE_GITHUB= nodefault
GH_TUPLE= PySCeS:pysces:0.9.6:fortran GH_TUPLE= PySCeS:pysces:0.9.8:fortran
BINARY_ALIAS= gfortran6=flang # it keeps using gfortran6 regardless of the environment variables and arguments
FORTRAN_FILES= linalg_nleq2.f nleq2.f wnorm.f zibconst.f zibmon.f zibsec.f FORTRAN_FILES= linalg_nleq2.f nleq2.f wnorm.f zibconst.f zibmon.f zibsec.f
@ -31,7 +29,7 @@ post-patch:
pre-build: # compile fortran files into a static library because distutils fails while doing this pre-build: # compile fortran files into a static library because distutils fails while doing this
@${MKDIR} ${WRKDIR}/.fbuild && \ @${MKDIR} ${WRKDIR}/.fbuild && \
cd ${WRKDIR}/.fbuild && \ cd ${WRKDIR}/.fbuild && \
flang -c ${CFLAGS} -fPIC ${FORTRAN_FILES:C,^,${WRKSRC_fortran}/pysces/nleq2/,} && \ ${FC} -c ${CFLAGS} -fPIC ${FORTRAN_FILES:C,^,${WRKSRC_fortran}/pysces/nleq2/,} && \
${AR} -qc libff.a ${FORTRAN_FILES:S/.f/.o/} ${AR} -qc libff.a ${FORTRAN_FILES:S/.f/.o/}
post-install: post-install:

View file

@ -1,5 +1,5 @@
TIMESTAMP = 1524415019 TIMESTAMP = 1589502332
SHA256 (pynleq2-0.0.2.tar.gz) = b9be75bb7def34cd7a82aed87b70f6c3c9f4602cbe9e8d4fcf43a4aae241112d SHA256 (pynleq2-0.0.2.tar.gz) = b9be75bb7def34cd7a82aed87b70f6c3c9f4602cbe9e8d4fcf43a4aae241112d
SIZE (pynleq2-0.0.2.tar.gz) = 6219 SIZE (pynleq2-0.0.2.tar.gz) = 6219
SHA256 (PySCeS-pysces-0.9.6_GH0.tar.gz) = 0888488fa9a8d11c4885e084af0c5825d9c37d1fb8a133899a657d79bc503fa4 SHA256 (PySCeS-pysces-0.9.8_GH0.tar.gz) = a97af5afe50fe994e84d33455ded5821f694d809f6a36adc9b486bb209d58a72
SIZE (PySCeS-pysces-0.9.6_GH0.tar.gz) = 2673710 SIZE (PySCeS-pysces-0.9.8_GH0.tar.gz) = 2655864

View file

@ -20,8 +20,8 @@
Extension('pynleq2.nleq2', [os.path.join('nleq2', f) Extension('pynleq2.nleq2', [os.path.join('nleq2', f)
- for f in ('nleq2.pyf',) + sources]) - for f in ('nleq2.pyf',) + sources])
+ for f in ('nleq2.pyf',)] + for f in ('nleq2.pyf',)]
+ , libraries=['ff', 'flang', 'execinfo'] + , libraries=['ff', 'execinfo']
+ , library_dirs=['../.fbuild', '/usr/local/flang/lib']) + , library_dirs=['../.fbuild'])
] ]
PYNLEQ2_RELEASE_VERSION = os.environ.get('PYNLEQ2_RELEASE_VERSION', '') PYNLEQ2_RELEASE_VERSION = os.environ.get('PYNLEQ2_RELEASE_VERSION', '')