summaryrefslogtreecommitdiff
path: root/lang/python26
diff options
context:
space:
mode:
authorLi-Wen Hsu <lwhsu@FreeBSD.org>2011-08-19 13:09:30 +0000
committerLi-Wen Hsu <lwhsu@FreeBSD.org>2011-08-19 13:09:30 +0000
commit80b804c403827a7276588b6245b3cd6043165bd4 (patch)
tree1133188e0de81a4bec033859292dcba479863668 /lang/python26
parentAdd support for running multiple instances (diff)
- Fix pkg-plist when building with WITHOUT_THREADS
PR: ports/159842 Submitted by: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
Notes
Notes: svn path=/head/; revision=280013
Diffstat (limited to 'lang/python26')
-rw-r--r--lang/python26/Makefile2
-rw-r--r--lang/python26/pkg-plist2
2 files changed, 3 insertions, 1 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index cef3f1d171c2..8f1e32eb9c96 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -82,6 +82,7 @@ PLIST_SUB+= IF_DEFAULT="@comment "
CFLAGS+= -D__wchar_t=wchar_t
.if !defined(WITHOUT_THREADS)
+PLIST_SUB+= THREADS=""
.if defined(WITH_PTH)
CONFIGURE_ARGS+= --with-pth
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-configure-pth
@@ -101,6 +102,7 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x20000
CFLAGS+= -DTHREAD_STACK_SIZE=0x100000
.endif # defined(WITHOUT_HUGE_STACK_SIZE)
.else # defined(WITHOUT_THREADS)
+PLIST_SUB+= THREADS="@comment "
CONFIGURE_ARGS+= --without-threads
.if defined(LDFLAGS)
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index 2b1db6a4cb37..7f3720bf6a10 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -804,7 +804,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib-dynload/_locale.so
%%PYTHON_LIBDIR%%/lib-dynload/_lsprof.so
%%PYTHON_LIBDIR%%/lib-dynload/_multibytecodec.so
-%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
+%%THREADS%%%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
%%PYTHON_LIBDIR%%/lib-dynload/_random.so
%%PYTHON_LIBDIR%%/lib-dynload/_sha256.so
%%PYTHON_LIBDIR%%/lib-dynload/_sha512.so