Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Feb 2021 18:12:29 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r565258 - in head/math/py-pynleq2: . files
Message-ID:  <202102141812.11EICTbF038118@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Sun Feb 14 18:12:28 2021
New Revision: 565258
URL: https://svnweb.freebsd.org/changeset/ports/565258

Log:
  math/py-pynleq2: Remove dependency on flang.

Modified:
  head/math/py-pynleq2/Makefile
  head/math/py-pynleq2/distinfo
  head/math/py-pynleq2/files/patch-setup.py

Modified: head/math/py-pynleq2/Makefile
==============================================================================
--- head/math/py-pynleq2/Makefile	Sun Feb 14 18:07:09 2021	(r565257)
+++ head/math/py-pynleq2/Makefile	Sun Feb 14 18:12:28 2021	(r565258)
@@ -2,7 +2,7 @@
 
 PORTNAME=	pynleq2
 DISTVERSION=	0.0.2
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,13 +16,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 
-USES=		fortran:flang python:3.6+
+USES=		fortran python:3.6+
 USE_PYTHON=	distutils autoplist
 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
 
 post-patch:
@@ -31,7 +29,7 @@ post-patch:
 pre-build: # compile fortran files into a static library because distutils fails while doing this
 	@${MKDIR} ${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/}
 
 post-install:

Modified: head/math/py-pynleq2/distinfo
==============================================================================
--- head/math/py-pynleq2/distinfo	Sun Feb 14 18:07:09 2021	(r565257)
+++ head/math/py-pynleq2/distinfo	Sun Feb 14 18:12:28 2021	(r565258)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1524415019
+TIMESTAMP = 1589502332
 SHA256 (pynleq2-0.0.2.tar.gz) = b9be75bb7def34cd7a82aed87b70f6c3c9f4602cbe9e8d4fcf43a4aae241112d
 SIZE (pynleq2-0.0.2.tar.gz) = 6219
-SHA256 (PySCeS-pysces-0.9.6_GH0.tar.gz) = 0888488fa9a8d11c4885e084af0c5825d9c37d1fb8a133899a657d79bc503fa4
-SIZE (PySCeS-pysces-0.9.6_GH0.tar.gz) = 2673710
+SHA256 (PySCeS-pysces-0.9.8_GH0.tar.gz) = a97af5afe50fe994e84d33455ded5821f694d809f6a36adc9b486bb209d58a72
+SIZE (PySCeS-pysces-0.9.8_GH0.tar.gz) = 2655864

Modified: head/math/py-pynleq2/files/patch-setup.py
==============================================================================
--- head/math/py-pynleq2/files/patch-setup.py	Sun Feb 14 18:07:09 2021	(r565257)
+++ head/math/py-pynleq2/files/patch-setup.py	Sun Feb 14 18:12:28 2021	(r565258)
@@ -20,8 +20,8 @@
          Extension('pynleq2.nleq2', [os.path.join('nleq2', f)
 -                                    for f in ('nleq2.pyf',) + sources])
 +                                    for f in ('nleq2.pyf',)]
-+                                   , libraries=['ff', 'flang', 'execinfo']
-+                                   , library_dirs=['../.fbuild', '/usr/local/flang/lib'])
++                                   , libraries=['ff', 'execinfo']
++                                   , library_dirs=['../.fbuild'])
      ]
  
  PYNLEQ2_RELEASE_VERSION = os.environ.get('PYNLEQ2_RELEASE_VERSION', '')



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102141812.11EICTbF038118>