tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: py-Scientific fix
I think this should be the final patch set.
pkglint runs clean now and it builds on NetBSD 7 and CentOS 7.
I did not bump PKGREVISION because I don't think any existing binary
packages are changed by this. These changes only affect platforms for
which the build was failing.
Any more comments?
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/py-Scientific/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- Makefile 13 Dec 2018 19:52:09 -0000 1.54
+++ Makefile 28 Mar 2019 12:49:49 -0000
@@ -9,13 +9,17 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://dirac.cnrs-orleans.fr/ScientificPython/
COMMENT= Python modules for scientific computing
+LICENSE= cecill-2.1
CONFLICTS+= py-Scientific-[0-9]*
MAKE_ENV+= NETCDF_PREFIX=${BUILDLINK_PREFIX.netcdf}
-PLIST_SUBST+= OSNAME=${LOWER_OPSYS:S/solaris/sunos/}
-PLIST_SUBST+= OSVER=${OS_VERSION:C/^(.).*/\1/}
+.include "../../lang/python/pyversion.mk"
+
+PYPLAT_CMD= ${PYTHONBIN} -c "import sys; print sys.platform"
+PLIST_SUBST+= PYPLAT=${PYPLAT_CMD:sh}
+
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 37 # not yet ported as of 2.8.1
INSTALLATION_DIRS= bin
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/math/py-Scientific/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- PLIST 25 Sep 2014 12:59:30 -0000 1.10
+++ PLIST 28 Mar 2019 12:49:49 -0000
@@ -223,8 +223,8 @@
${PYSITELIB}/Scientific/indexing.py
${PYSITELIB}/Scientific/indexing.pyc
${PYSITELIB}/Scientific/indexing.pyo
-${PYSITELIB}/Scientific/${OSNAME}${OSVER}/Scientific_affinitypropagation.so
-${PYSITELIB}/Scientific/${OSNAME}${OSVER}/Scientific_interpolation.so
-${PYSITELIB}/Scientific/${OSNAME}${OSVER}/Scientific_netcdf.so
-${PYSITELIB}/Scientific/${OSNAME}${OSVER}/Scientific_numerics_package_id.so
-${PYSITELIB}/Scientific/${OSNAME}${OSVER}/Scientific_vector.so
+${PYSITELIB}/Scientific/${PYPLAT}/Scientific_affinitypropagation.so
+${PYSITELIB}/Scientific/${PYPLAT}/Scientific_interpolation.so
+${PYSITELIB}/Scientific/${PYPLAT}/Scientific_netcdf.so
+${PYSITELIB}/Scientific/${PYPLAT}/Scientific_numerics_package_id.so
+${PYSITELIB}/Scientific/${PYPLAT}/Scientific_vector.so
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/math/py-Scientific/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo 3 Nov 2015 23:33:41 -0000 1.9
+++ distinfo 28 Mar 2019 12:49:49 -0000
@@ -4,5 +4,5 @@
RMD160 (ScientificPython-2.8.1.tar.gz) =
53131b769acafd0ef5e6b3e5f022e40ffa2b4663
SHA512 (ScientificPython-2.8.1.tar.gz) =
ebd083ca3c0f013d8308a717411614b934e7069d81f92a4eb96d4115066fd13a183d71c228343659358e6f21e95e908384ad4dc79349c5c64ebe2816efb6bd19
Size (ScientificPython-2.8.1.tar.gz) = 559819 bytes
-SHA1 (patch-aa) = c7f353e9264749e3afff633fb28623f053b39f1c
+SHA1 (patch-aa) = 22e5c60651e340a4b5c6c3d24d7aac0b4faaad19
SHA1 (patch-ab) = 159a6bb2da1f881e755a4c5c2c8c44cef2fb228a
cvs diff: Diffing patches
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/math/py-Scientific/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patches/patch-aa 29 May 2010 03:18:54 -0000 1.4
+++ patches/patch-aa 28 Mar 2019 12:49:49 -0000
@@ -1,5 +1,7 @@
$NetBSD: patch-aa,v 1.4 2010/05/29 03:18:54 obache Exp $
+Locate shared libraries at run time
+
--- setup.py.orig 2008-10-28 13:31:44.000000000 +0000
+++ setup.py
@@ -113,6 +113,7 @@ else:
Home |
Main Index |
Thread Index |
Old Index