pkgsrc-Users archive

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

[PATCH] fix py34-boost installing conflicting copies of libs



Hi,

attached is a patch that prevents py3x-boost from installing redundant
copies of libboost_python that conflict with py27-boost. With the
patch, py27-boost installs libboost_python.so and friends and
py3x-boost installs libboost_python3.so and friends.


Alrighty then,

Thomas

PS: Thanks to _wiz_ for telling me where and how I have to add the
Makefile hack.

-- 
Dr. Thomas Orgis
Universität Hamburg
RRZ / Zentrale Dienste / HPC
Schlüterstr. 70
20146 Hamburg
Tel.: 040/42838 8826
Fax: 040/428 38 6270
diff -ruN pkgsrc-2015Q4/devel/py-boost/Makefile pkgsrc/devel/py-boost/Makefile
--- pkgsrc-2015Q4/devel/py-boost/Makefile	2015-07-13 17:08:55.000000000 +0200
+++ pkgsrc/devel/py-boost/Makefile	2016-02-24 17:19:11.780202567 +0100
@@ -27,4 +27,11 @@
 
 do-install: boost-install-libs
 
+.if ${PYPKGPREFIX} != py27
+# The python3 variant also includes redundant copies of the libs
+# that conflict with the python2 variant.
+post-install:
+	${RM} -v ${DESTDIR}${PREFIX}/lib/libboost_python.*
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff -ruN pkgsrc-2015Q4/devel/py-boost/PLIST pkgsrc/devel/py-boost/PLIST
--- pkgsrc-2015Q4/devel/py-boost/PLIST	2015-07-13 17:08:55.000000000 +0200
+++ pkgsrc/devel/py-boost/PLIST	2016-02-24 16:55:45.948211325 +0100
@@ -1,7 +1,7 @@
 @comment $NetBSD: PLIST,v 1.1 2015/07/13 15:08:55 wiz Exp $
-lib/libboost_python.a
-lib/libboost_python.so
-lib/libboost_python.so.${BOOST_VERSION}
+${PLIST.py2x}lib/libboost_python.a
+${PLIST.py2x}lib/libboost_python.so
+${PLIST.py2x}lib/libboost_python.so.${BOOST_VERSION}
 ${PLIST.py3x}lib/libboost_python3.a
 ${PLIST.py3x}lib/libboost_python3.so
 ${PLIST.py3x}lib/libboost_python3.so.${BOOST_VERSION}

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



Home | Main Index | Thread Index | Old Index