From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 17 17:20:02 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91CE41065674 for ; Wed, 17 Aug 2011 17:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6ED468FC23 for ; Wed, 17 Aug 2011 17:20:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p7HHK1tG091272 for ; Wed, 17 Aug 2011 17:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p7HHK1hF091271; Wed, 17 Aug 2011 17:20:01 GMT (envelope-from gnats) Resent-Date: Wed, 17 Aug 2011 17:20:01 GMT Resent-Message-Id: <201108171720.p7HHK1hF091271@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ruslan Mahmatkhanov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB594106567B for ; Wed, 17 Aug 2011 17:11:32 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id AB0798FC27 for ; Wed, 17 Aug 2011 17:11:32 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p7HHBWBL029726 for ; Wed, 17 Aug 2011 17:11:32 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p7HHBVHe029725; Wed, 17 Aug 2011 17:11:31 GMT (envelope-from nobody) Message-Id: <201108171711.p7HHBVHe029725@red.freebsd.org> Date: Wed, 17 Aug 2011 17:11:31 GMT From: Ruslan Mahmatkhanov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/159842: [PATCH] lang/python27: fix pkg-plist in case of building with WITHOUT_THREADS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Aug 2011 17:20:02 -0000 >Number: 159842 >Category: ports >Synopsis: [PATCH] lang/python27: fix pkg-plist in case of building with WITHOUT_THREADS >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Aug 17 17:20:01 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Ruslan Mahmatkhanov >Release: 9.0-BETA1 >Organization: >Environment: 9.0-BETA1 i386 >Description: Fix pkg-plist of lang/python27 in case of installing with WITHOUT_THREADS knob set. Python doesn't install %%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so in that case. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruNa python27.orig/Makefile python27/Makefile --- python27.orig/Makefile 2011-08-16 16:55:53.000000000 +0400 +++ python27/Makefile 2011-08-16 17:57:53.000000000 +0400 @@ -6,7 +6,7 @@ PORTNAME= python27 PORTVERSION= 2.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -83,6 +83,7 @@ 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=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 -ruNa python27.orig/pkg-plist python27/pkg-plist --- python27.orig/pkg-plist 2011-06-27 13:22:10.000000000 +0400 +++ python27/pkg-plist 2011-08-16 17:38:00.000000000 +0400 @@ -860,7 +860,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 +%%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 >Release-Note: >Audit-Trail: >Unformatted: