- Fix pkg-plist when building with WITHOUT_THREADS

PR:		ports/159842
Submitted by:	Ruslan Mahmatkhanov <cvs-src@yandex.ru>

8 files changed, 14 insertions, 6 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
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 27b684cd6448..d8ee01c78ed3 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -83,6 +83,7 @@ PLIST_SUB+=	IF_DEFAULT="@comment "
 CFLAGS+=	-D__wchar_t=wchar_t
 
 .if !defined(WITHOUT_THREADS)
+PLIST_SUB+=	THREADS=""
 .if defined(WITH_PTH)
 BROKEN=			does not build with PTH enabled
 CONFIGURE_ARGS+=	--with-pth
@@ -103,6 +104,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/python27/pkg-plist b/lang/python27/pkg-plist
index 6ccffb91ac18..716ff6ff53f5 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -860,7 +860,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
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 18f2e9978bb3..0650170d3525 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -67,6 +67,7 @@ PLIST_SUB+=	IF_DEFAULT="@comment "
 CFLAGS+=	-D__wchar_t=wchar_t
 
 .if !defined(WITHOUT_THREADS)
+PLIST_SUB+=	THREADS=""
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
 .if defined(WITHOUT_HUGE_STACK_SIZE)
@@ -75,7 +76,8 @@ CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
 CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
 .endif # defined(WITHOUT_HUGE_STACK_SIZE)
 CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
-.else
+.else # defined(WITHOUT_THREADS)
+PLIST_SUB+=	THREADS="@comment "
 CONFIGURE_ARGS+=	--without-threads
 .if defined(LDFLAGS)
 CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index c186aed766c0..a40334f4dab5 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -711,7 +711,7 @@ libdata/pkgconfig/python-3.1.pc
 %%PYTHON_LIBDIR%%/lib-dynload/_json.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/_pickle.so
 %%PYTHON_LIBDIR%%/lib-dynload/_random.so
 %%PYTHON_LIBDIR%%/lib-dynload/_sha256.so
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 108aa4653666..37a32ecee894 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -68,6 +68,7 @@ PLIST_SUB+=	IF_DEFAULT="@comment "
 CFLAGS+=	-D__wchar_t=wchar_t
 
 .if !defined(WITHOUT_THREADS)
+PLIST_SUB+=	THREADS=""
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
 .if defined(WITHOUT_HUGE_STACK_SIZE)
@@ -76,7 +77,8 @@ CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
 CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
 .endif # defined(WITHOUT_HUGE_STACK_SIZE)
 CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
-.else
+.else # defined(WITHOUT_THREADS)
+PLIST_SUB+=	THREADS="@comment "
 CONFIGURE_ARGS+=	--without-threads
 .if defined(LDFLAGS)
 CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 971f48902224..15ae0bbddedc 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -1894,7 +1894,7 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/lib-dynload/_json.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/_pickle.so
 %%PYTHON_LIBDIR%%/lib-dynload/_posixsubprocess.so
 %%PYTHON_LIBDIR%%/lib-dynload/_random.so