Re: CVS commit: pkgsrc/math/py-scipy

To: Min Sik Kim <minskim%netbsd.org@localhost>
Subject: Re: CVS commit: pkgsrc/math/py-scipy
From: Adam <adam%netbsd.org@localhost>
Date: Sat, 12 May 2018 08:49:49 +0200
Are you sure this is correct? I would rather turn off dsyms than fix a PLIST. :)

Kind regards,
Adam


> Wiadomość napisana przez Min Sik Kim <minskim%netbsd.org@localhost> w dniu 11.05.2018, o godz. 16:18:
> 
> Module Name:  pkgsrc
> Committed By: minskim
> Date:         Fri May 11 14:18:47 UTC 2018
> 
> Modified Files:
>       pkgsrc/math/py-scipy: Makefile
> Added Files:
>       pkgsrc/math/py-scipy: PLIST.Darwin
> 
> Log Message:
> math/py-scipy: Fix PLIST on Darwin with gfortran7
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.30 -r1.31 pkgsrc/math/py-scipy/Makefile
> cvs rdiff -u -r0 -r1.1 pkgsrc/math/py-scipy/PLIST.Darwin
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 
> Modified files:
> 
> Index: pkgsrc/math/py-scipy/Makefile
> diff -u pkgsrc/math/py-scipy/Makefile:1.30 pkgsrc/math/py-scipy/Makefile:1.31
> --- pkgsrc/math/py-scipy/Makefile:1.30        Mon Apr  2 19:52:53 2018
> +++ pkgsrc/math/py-scipy/Makefile     Fri May 11 14:18:47 2018
> @@ -1,4 +1,4 @@
> -# $NetBSD: Makefile,v 1.30 2018/04/02 19:52:53 adam Exp $
> +# $NetBSD: Makefile,v 1.31 2018/05/11 14:18:47 minskim Exp $
> 
> DISTNAME=     scipy-1.0.1
> PKGNAME=      ${PYPKGPREFIX}-${DISTNAME}
> @@ -13,6 +13,8 @@ LICENSE=    modified-bsd
> USE_LANGUAGES+=       c c++ fortran
> MAKE_ENV+=    ATLAS=None
> 
> +PLIST_VARS+= dsym
> +
> # XXX Avoid picking up other compilers when installed
> .include "../../mk/compiler.mk"
> 
> @@ -20,6 +22,9 @@ MAKE_ENV+=  ATLAS=None
> PYSETUPBUILDARGS+=    --fcompiler=g95
> .elif defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mgfortran)
> PYSETUPBUILDARGS+=    --fcompiler=gnu95
> +.  if ${GFORTRAN_VERSION} == "7"
> +PLIST.dsym=  yes
> +.  endif
> LDFLAGS.Darwin+=      -undefined dynamic_lookup
> .else
> BROKEN=               Requires fortran 95
> @@ -87,7 +92,9 @@ REPLACE_PYTHON+=    scipy/stats/setup.py
> .PHONY: fix-darwin-install-name
> post-install: fix-darwin-install-name
> fix-darwin-install-name:
> -     ${FIND} ${DESTDIR}${PREFIX} -name "*.so" | while read lib; do   \
> +     ${FIND} ${DESTDIR}${PREFIX} -name "*.so" |                      \
> +             ${GREP} -v "dSYM/Contents/Resources/DWARF/" |           \
> +             while read lib; do                                      \
>               libname=`basename $${lib}`;                             \
>               libdir=`dirname $${lib} | sed -e 's,${DESTDIR},,'`;     \
>               install_name_tool -id $${libdir}/$${libname} $${lib};   \
> 
> Added files:
> 
> Index: pkgsrc/math/py-scipy/PLIST.Darwin
> diff -u /dev/null pkgsrc/math/py-scipy/PLIST.Darwin:1.1
> --- /dev/null Fri May 11 14:18:47 2018
> +++ pkgsrc/math/py-scipy/PLIST.Darwin Fri May 11 14:18:47 2018
> @@ -0,0 +1,65 @@
> +@comment $NetBSD: PLIST.Darwin,v 1.1 2018/05/11 14:18:47 minskim Exp $
> +${PLIST.dsym}${PYSITELIB}/scipy/fftpack/_fftpack.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/fftpack/_fftpack.so.dSYM/Contents/Resources/DWARF/_fftpack.so
> +${PLIST.dsym}${PYSITELIB}/scipy/fftpack/convolve.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/fftpack/convolve.so.dSYM/Contents/Resources/DWARF/convolve.so
> +${PLIST.dsym}${PYSITELIB}/scipy/integrate/_dop.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/integrate/_dop.so.dSYM/Contents/Resources/DWARF/_dop.so
> +${PLIST.dsym}${PYSITELIB}/scipy/integrate/_odepack.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/integrate/_odepack.so.dSYM/Contents/Resources/DWARF/_odepack.so
> +${PLIST.dsym}${PYSITELIB}/scipy/integrate/_quadpack.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/integrate/_quadpack.so.dSYM/Contents/Resources/DWARF/_quadpack.so
> +${PLIST.dsym}${PYSITELIB}/scipy/integrate/_test_odeint_banded.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/integrate/_test_odeint_banded.so.dSYM/Contents/Resources/DWARF/_test_odeint_banded.so
> +${PLIST.dsym}${PYSITELIB}/scipy/integrate/lsoda.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/integrate/lsoda.so.dSYM/Contents/Resources/DWARF/lsoda.so
> +${PLIST.dsym}${PYSITELIB}/scipy/integrate/vode.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/integrate/vode.so.dSYM/Contents/Resources/DWARF/vode.so
> +${PLIST.dsym}${PYSITELIB}/scipy/interpolate/_bspl.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/interpolate/_bspl.so.dSYM/Contents/Resources/DWARF/_bspl.so
> +${PLIST.dsym}${PYSITELIB}/scipy/interpolate/_fitpack.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/interpolate/_fitpack.so.dSYM/Contents/Resources/DWARF/_fitpack.so
> +${PLIST.dsym}${PYSITELIB}/scipy/interpolate/dfitpack.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/interpolate/dfitpack.so.dSYM/Contents/Resources/DWARF/dfitpack.so
> +${PLIST.dsym}${PYSITELIB}/scipy/io/_test_fortran.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/io/_test_fortran.so.dSYM/Contents/Resources/DWARF/_test_fortran.so
> +${PLIST.dsym}${PYSITELIB}/scipy/linalg/_fblas.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/linalg/_fblas.so.dSYM/Contents/Resources/DWARF/_fblas.so
> +${PLIST.dsym}${PYSITELIB}/scipy/linalg/_flapack.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/linalg/_flapack.so.dSYM/Contents/Resources/DWARF/_flapack.so
> +${PLIST.dsym}${PYSITELIB}/scipy/linalg/_flinalg.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/linalg/_flinalg.so.dSYM/Contents/Resources/DWARF/_flinalg.so
> +${PLIST.dsym}${PYSITELIB}/scipy/linalg/_interpolative.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/linalg/_interpolative.so.dSYM/Contents/Resources/DWARF/_interpolative.so
> +${PLIST.dsym}${PYSITELIB}/scipy/linalg/cython_blas.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/linalg/cython_blas.so.dSYM/Contents/Resources/DWARF/cython_blas.so
> +${PLIST.dsym}${PYSITELIB}/scipy/linalg/cython_lapack.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/linalg/cython_lapack.so.dSYM/Contents/Resources/DWARF/cython_lapack.so
> +${PLIST.dsym}${PYSITELIB}/scipy/odr/__odrpack.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/odr/__odrpack.so.dSYM/Contents/Resources/DWARF/__odrpack.so
> +${PLIST.dsym}${PYSITELIB}/scipy/optimize/_cobyla.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/optimize/_cobyla.so.dSYM/Contents/Resources/DWARF/_cobyla.so
> +${PLIST.dsym}${PYSITELIB}/scipy/optimize/_lbfgsb.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/optimize/_lbfgsb.so.dSYM/Contents/Resources/DWARF/_lbfgsb.so
> +${PLIST.dsym}${PYSITELIB}/scipy/optimize/_minpack.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/optimize/_minpack.so.dSYM/Contents/Resources/DWARF/_minpack.so
> +${PLIST.dsym}${PYSITELIB}/scipy/optimize/_nnls.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/optimize/_nnls.so.dSYM/Contents/Resources/DWARF/_nnls.so
> +${PLIST.dsym}${PYSITELIB}/scipy/optimize/_slsqp.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/optimize/_slsqp.so.dSYM/Contents/Resources/DWARF/_slsqp.so
> +${PLIST.dsym}${PYSITELIB}/scipy/optimize/minpack2.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/optimize/minpack2.so.dSYM/Contents/Resources/DWARF/minpack2.so
> +${PLIST.dsym}${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/_arpack.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/sparse/linalg/eigen/arpack/_arpack.so.dSYM/Contents/Resources/DWARF/_arpack.so
> +${PLIST.dsym}${PYSITELIB}/scipy/sparse/linalg/isolve/_iterative.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/sparse/linalg/isolve/_iterative.so.dSYM/Contents/Resources/DWARF/_iterative.so
> +${PLIST.dsym}${PYSITELIB}/scipy/special/_ufuncs.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/special/_ufuncs.so.dSYM/Contents/Resources/DWARF/_ufuncs.so
> +${PLIST.dsym}${PYSITELIB}/scipy/special/cython_special.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/special/cython_special.so.dSYM/Contents/Resources/DWARF/cython_special.so
> +${PLIST.dsym}${PYSITELIB}/scipy/special/specfun.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/special/specfun.so.dSYM/Contents/Resources/DWARF/specfun.so
> +${PLIST.dsym}${PYSITELIB}/scipy/stats/mvn.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/stats/mvn.so.dSYM/Contents/Resources/DWARF/mvn.so
> +${PLIST.dsym}${PYSITELIB}/scipy/stats/statlib.so.dSYM/Contents/Info.plist
> +${PLIST.dsym}${PYSITELIB}/scipy/stats/statlib.so.dSYM/Contents/Resources/DWARF/statlib.so
>
Follow-Ups:
- Re: CVS commit: pkgsrc/math/py-scipy
  - From: Min Sik Kim
References:
- CVS commit: pkgsrc/math/py-scipy
  - From: Min Sik Kim
Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/time/py-tzdata
Previous by Thread: CVS commit: pkgsrc/math/py-scipy
Next by Thread: Re: CVS commit: pkgsrc/math/py-scipy
Indexes:
Home | Main Index | Thread Index | Old Index