summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2017-12-13 12:54:57 +0000
committerjperkin <jperkin@pkgsrc.org>2017-12-13 12:54:57 +0000
commitd03b3a31b94999e40519a6633ba8832a0bf158e3 (patch)
tree82e71985e11fbfb392aa5fef3621fda0d67cfae3 /lang
parent58cabd0458f9f8b424378fd20d20e29291b47158 (diff)
downloadpkgsrc-d03b3a31b94999e40519a6633ba8832a0bf158e3.tar.gz
python34: Disable libpython3.so.
This is a useless library (we've built it incorrectly for a long time so it contains no valid symbols) that only creates CONFLICTS with other python3 packages. No objection on tech-pkg. Bump PKGREVISION.
Diffstat (limited to 'lang')
-rw-r--r--lang/python34/Makefile3
-rw-r--r--lang/python34/PLIST3
-rw-r--r--lang/python34/distinfo4
-rw-r--r--lang/python34/patches/patch-au15
4 files changed, 18 insertions, 7 deletions
diff --git a/lang/python34/Makefile b/lang/python34/Makefile
index 817e23106f1..ae7439ac651 100644
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2017/11/22 19:16:20 bsiegert Exp $
+# $NetBSD: Makefile,v 1.23 2017/12/13 12:54:57 jperkin Exp $
.include "dist.mk"
PKGNAME= python34-${PY_DISTVERSION}
+PKGREVISION= 1
CATEGORIES= lang python
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/lang/python34/PLIST b/lang/python34/PLIST
index 572b5bc43b1..d8f601ff60d 100644
--- a/lang/python34/PLIST
+++ b/lang/python34/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2017/01/19 01:25:09 wen Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/12/13 12:54:57 jperkin Exp $
bin/2to3-${PY_VER_SUFFIX}
bin/pydoc${PY_VER_SUFFIX}
bin/python${PY_VER_SUFFIX}
@@ -101,7 +101,6 @@ include/python${PY_VER_SUFFIX}/warnings.h
include/python${PY_VER_SUFFIX}/weakrefobject.h
lib/libpython${PY_VER_SUFFIX}.so
lib/libpython${PY_VER_SUFFIX}.so.1.0
-lib/libpython3.so
lib/pkgconfig/python-${PY_VER_SUFFIX}.pc
lib/python${PY_VER_SUFFIX}/LICENSE.txt
lib/python${PY_VER_SUFFIX}/__future__.py
diff --git a/lang/python34/distinfo b/lang/python34/distinfo
index 57293ebbfc0..f4fe0652cbb 100644
--- a/lang/python34/distinfo
+++ b/lang/python34/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2017/11/01 21:51:21 wiz Exp $
+$NetBSD: distinfo,v 1.29 2017/12/13 12:54:57 jperkin Exp $
SHA1 (Python-3.4.7.tar.xz) = 7b05bf099f3f311ba568232d0d03d64e67da9908
RMD160 (Python-3.4.7.tar.xz) = 8c4cde8603a15cd55b59b665a84efd0e8f9d7553
@@ -11,7 +11,7 @@ SHA1 (patch-ah) = 0acdfcbf3ebcb96b18a1cf28f18b286aa507a62f
SHA1 (patch-al) = 5cf4d44d24020a9b6fe41deeb916edbe87a937cb
SHA1 (patch-am) = 5822927f1c315b4fce5078626efe5418c764665e
SHA1 (patch-an) = c9b571eb54fdf0b1e93524a6de6780e8c4119221
-SHA1 (patch-au) = b593d64b34531fdd5a936d109854d80e969f1847
+SHA1 (patch-au) = 210a20f828d213680166541114dc3e5d5ff9f510
SHA1 (patch-av) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
SHA1 (patch-aw) = bd290417c265846e238660180e60e76c0f5f696a
SHA1 (patch-pyconfig.h.in) = 1fbd8b94a6317e31a3b9db683db0c2c9c4334713
diff --git a/lang/python34/patches/patch-au b/lang/python34/patches/patch-au
index 8d6260b3434..bb4a12491f9 100644
--- a/lang/python34/patches/patch-au
+++ b/lang/python34/patches/patch-au
@@ -1,6 +1,8 @@
-$NetBSD: patch-au,v 1.2 2015/03/16 13:53:05 tnn Exp $
+$NetBSD: patch-au,v 1.3 2017/12/13 12:54:57 jperkin Exp $
---- Makefile.pre.in.orig 2015-02-25 11:27:45.000000000 +0000
+Do not build/install libpython3.so.
+
+--- Makefile.pre.in.orig 2017-08-09 07:08:33.000000000 +0000
+++ Makefile.pre.in
@@ -86,7 +86,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODI
# be able to build extension modules using the directories specified in the
@@ -11,6 +13,15 @@ $NetBSD: patch-au,v 1.2 2015/03/16 13:53:05 tnn Exp $
NO_AS_NEEDED= @NO_AS_NEEDED@
LDLAST= @LDLAST@
SGI_ABI= @SGI_ABI@
+@@ -194,7 +194,7 @@ DIST= $(DISTFILES) $(DISTDIRS)
+ LIBRARY= @LIBRARY@
+ LDLIBRARY= @LDLIBRARY@
+ BLDLIBRARY= @BLDLIBRARY@
+-PY3LIBRARY= @PY3LIBRARY@
++PY3LIBRARY=
+ DLLLIBRARY= @DLLLIBRARY@
+ LDLIBRARYDIR= @LDLIBRARYDIR@
+ INSTSONAME= @INSTSONAME@
@@ -683,7 +683,7 @@ Modules/_testembed: Modules/_testembed.o
Modules/_freeze_importlib: Modules/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
$(LINKCC) $(PY_LDFLAGS) -o $@ Modules/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)