From owner-freebsd-python@FreeBSD.ORG  Thu Apr 22 01:56:12 2010
Return-Path: <owner-freebsd-python@FreeBSD.ORG>
Delivered-To: python@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D4C0F1065670
	for <python@FreeBSD.org>; Thu, 22 Apr 2010 01:56:12 +0000 (UTC)
	(envelope-from linimon@lonesome.com)
Received: from mail.soaustin.net (lefty.soaustin.net [66.135.55.46])
	by mx1.freebsd.org (Postfix) with ESMTP id BBBBB8FC1E
	for <python@FreeBSD.org>; Thu, 22 Apr 2010 01:56:12 +0000 (UTC)
Received: by mail.soaustin.net (Postfix, from userid 502)
	id D5EFC8C085; Wed, 21 Apr 2010 20:50:45 -0500 (CDT)
Date: Wed, 21 Apr 2010 20:50:45 -0500
From: Mark Linimon <linimon@lonesome.com>
To: python@FreeBSD.org
Message-ID: <20100422015045.GB12689@lonesome.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.18 (2008-05-17)
Cc: Mark Linimon <linimon@lonesome.com>
Subject: RFC: review a patch to lang/python25
X-BeenThere: freebsd-python@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: FreeBSD-specific Python issues <freebsd-python.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-python>, 
	<mailto:freebsd-python-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-python>
List-Post: <mailto:freebsd-python@freebsd.org>
List-Help: <mailto:freebsd-python-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-python>,
	<mailto:freebsd-python-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Apr 2010 01:56:12 -0000

This is to (partially) fix the build on powerpc, which currently turns
out to be a 32-bit arch just like i386 :-)

The patch appears to be pretty trivial.  I've tested it on powerpc but
not yet on i386/amd64.

Thanks.

mcl

Index: Makefile
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/lang/python25/Makefile,v
retrieving revision 1.159
diff -u -r1.159 Makefile
--- Makefile	2 Feb 2010 22:00:24 -0000	1.159
+++ Makefile	4 Apr 2010 05:05:06 -0000
@@ -89,11 +89,6 @@
 CONFIGURE_ARGS+=	--without-pymalloc
 .endif
 
-.if ${ARCH} == i386
-PLIST_SUB+=	X86_ONLY=""
-.else
-PLIST_SUB+=	X86_ONLY="@comment "
-.endif
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
 PLIST_SUB+=	32BIT_ONLY="@comment "
 .else
Index: pkg-plist
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/lang/python25/pkg-plist,v
retrieving revision 1.75
diff -u -r1.75 pkg-plist
--- pkg-plist	26 Nov 2009 14:04:18 -0000	1.75
+++ pkg-plist	4 Apr 2010 05:05:29 -0000
@@ -674,7 +674,7 @@
 %%32BIT_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/dl.so
 %%PYTHON_LIBDIR%%/lib-dynload/fcntl.so
 %%PYTHON_LIBDIR%%/lib-dynload/grp.so
-%%X86_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/imageop.so
+%%32BIT_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/imageop.so
 %%PYTHON_LIBDIR%%/lib-dynload/itertools.so
 %%PYTHON_LIBDIR%%/lib-dynload/math.so
 %%PYTHON_LIBDIR%%/lib-dynload/mmap.so
@@ -685,7 +685,7 @@
 %%PYTHON_LIBDIR%%/lib-dynload/pyexpat.so
 %%PYTHON_LIBDIR%%/lib-dynload/readline.so
 %%PYTHON_LIBDIR%%/lib-dynload/resource.so
-%%X86_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/rgbimg.so
+%%32BIT_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/rgbimg.so
 %%PYTHON_LIBDIR%%/lib-dynload/select.so
 %%PYTHON_LIBDIR%%/lib-dynload/strop.so
 %%PYTHON_LIBDIR%%/lib-dynload/syslog.so