ports/148406: [PATCH] lang/python26: fix build backage without threads

[Alexander Kriventsov]

>Number:         148406
>Category:       ports
>Synopsis:       [PATCH] lang/python26: fix build backage without threads
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 06 14:20:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Kriventsov
>Release:        FreeBSD 8.1-PRERELEASE #0: Tue Jul  6 07:28:09 UTC 2010    root at tinderbox.host:/usr/src/sys/magic/kernel/path
>Organization:
HC
>Environment:
FreeBSD sshgate.akriventsov.infra.hc.ru 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Sat Nov 21 15:02:08 UTC 2009     root at mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
When I tried to build package with option WITHOUT_THREADS, I got error
====================<phase 7: make package>====================
===>  Building package for python26-2.6.5
tar: lib/python2.6/lib-dynload/_multiprocessing.so: Cannot stat: No such file or directory
tar: Error exit delayed from previous errors.
pkg_create: make_dist: tar command failed with code 256
Creating package /tmp/packages/All/python26-2.6.5.tbz
Registering depends:.
Creating bzip'd tar ball in '/tmp/packages/All/python26-2.6.5.tbz'
*** Error code 1

Stop in /a/ports/lang/python26.
Deleting python26-2.6.5
pkg_delete: file '/usr/local/lib/python2.6/lib-dynload/_multiprocessing.so' doesn't exist
pkg_delete: couldn't entirely delete package (perhaps the packing list is
incorrectly specified?)
>How-To-Repeat:
make config - Set THREADS off
make package
>Fix:


Patch attached with submission follows:

diff -ur python26.orig/Makefile python26/Makefile
--- python26.orig/Makefile	2010-05-12 12:13:06.000000000 +0000
+++ python26/Makefile	2010-07-06 13:23:56.000000000 +0000
@@ -84,6 +84,7 @@
 
 .if !defined(WITHOUT_THREADS)
 .if defined(WITH_PTH)
+PTH_MSG=		""
 CONFIGURE_ARGS+=	--with-pth
 EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-configure-pth
 LIB_DEPENDS+=		pth:${PORTSDIR}/devel/pth
@@ -92,6 +93,7 @@
 CONFIGURE_ENV+=		CPPFLAGS="${_PTH_CPPFLAGS} ${CPPFLAGS}"
 CONFIGURE_ENV+=		LDFLAGS="${_PTH_LDFLAGS} ${LDFLAGS}"
 .else # !defined(WITH_PTH)
+PTH_MSG=		"@comment "
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
@@ -103,10 +105,12 @@
 .endif # defined(WITHOUT_HUGE_STACK_SIZE)
 .else # defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--without-threads
+PTH_MSG=		"@comment "
 .if defined(LDFLAGS)
 CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 .endif # defined(LDFLAGS)
 .endif # !defined(WITHOUT_THREADS)
+PLIST_SUB+=	PTH=${PTH_MSG}
 
 .if !defined(WITHOUT_UCS4) && !defined(WITH_UCS2)
 CONFIGURE_ARGS+=	--enable-unicode=ucs4
diff -ur python26.orig/pkg-plist python26/pkg-plist
--- python26.orig/pkg-plist	2010-05-12 12:13:06.000000000 +0000
+++ python26/pkg-plist	2010-07-06 13:28:29.000000000 +0000
@@ -803,7 +803,7 @@
 %%PYTHON_LIBDIR%%/lib-dynload/_locale.so
 %%PYTHON_LIBDIR%%/lib-dynload/_lsprof.so
 %%PYTHON_LIBDIR%%/lib-dynload/_multibytecodec.so
-%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
+%%PTH%%%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
 %%PYTHON_LIBDIR%%/lib-dynload/_random.so
 %%PYTHON_LIBDIR%%/lib-dynload/_sha256.so
 %%PYTHON_LIBDIR%%/lib-dynload/_sha512.so


>Release-Note:
>Audit-Trail:
>Unformatted: