pkgsrc-Users archive

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

Re: [PATCH] fixup for py-boost (numpy dep for both python2 and python3)



Am Thu, 13 Apr 2017 17:09:48 +0200
schrieb "Dr. Thomas Orgis" <thomas.orgis%uni-hamburg.de@localhost>:

> Attached
> is my full patch on top of 2017Q1.

That was not the full patch! The removal of the conflicting boost+numpy
library files for python3 was missing. Here is the full pach.


Alrighty then,

Thomas

-- 
Dr. Thomas Orgis
Universität Hamburg
RRZ / Basis-Infrastruktur / HPC
Schlüterstr. 70
20146 Hamburg
Tel.: 040/42838 8826
Fax: 040/428 38 6270
diff -x CVS -ruN pkgsrc-2017Q1/devel/py-boost/Makefile pkgsrc/devel/py-boost/Makefile
--- pkgsrc-2017Q1/devel/py-boost/Makefile	2017-01-03 14:23:01.000000000 +0100
+++ pkgsrc/devel/py-boost/Makefile	2017-04-13 15:52:50.064652244 +0200
@@ -31,6 +31,8 @@
 # that conflict with the python2 variant.
 post-install:
 	${RM} -f ${DESTDIR}${PREFIX}/lib/libboost_python.*
+	${RM} -f ${DESTDIR}${PREFIX}/lib/libboost_numpy.*
 .endif
 
+.include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -x CVS -ruN pkgsrc-2017Q1/devel/py-boost/PLIST pkgsrc/devel/py-boost/PLIST
--- pkgsrc-2017Q1/devel/py-boost/PLIST	2016-02-27 21:55:05.000000000 +0100
+++ pkgsrc/devel/py-boost/PLIST	2017-04-13 15:42:52.585819577 +0200
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2016/02/27 20:55:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/04/10 11:35:40 joerg Exp $
+${PLIST.py2x}lib/libboost_numpy.a
+${PLIST.py2x}lib/libboost_numpy.so
+${PLIST.py2x}lib/libboost_numpy.so.${BOOST_VERSION}
+${PLIST.py3x}lib/libboost_numpy3.a
+${PLIST.py3x}lib/libboost_numpy3.so
+${PLIST.py3x}lib/libboost_numpy3.so.${BOOST_VERSION}
 ${PLIST.py2x}lib/libboost_python.a
 ${PLIST.py2x}lib/libboost_python.so
 ${PLIST.py2x}lib/libboost_python.so.${BOOST_VERSION}

Attachment: smime.p7s
Description: S/MIME cryptographic signature



Home | Main Index | Thread Index | Old Index