request to commit some patches to fix lang/python* on powerpc

Tue Aug 24 06:16:14 UTC 2010

I was recently given some patches to fix various Python ports on powerpc,
and have tested them.  Does anyone have any objections if I commit these?

Thanks.

mcl

(note: although I didn't test lang/python24 yet, I'm fairly sure that the
same patch for python25 will fix it as well.)

--------------------------------------------------------------------------

the following is for lang/python25:

lang_python_2.5_diff.out

the following are for lang/python26:

lang_python_2.6_diff.out
patch-Modules-_ctypes-libffi-configure

the following is for lang/python26 and lang/python31:

patch-Modules-_ctypes-libffi-src-powerpc-ffitarget

-----------------------------------------------------------------

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	lang_python_2.5_diff.out
#	lang_python_2.6_diff.out
#	patch-Modules-_ctypes-libffi-configure
#	patch-Modules-_ctypes-libffi-src-powerpc-ffitarget
#
echo x - lang_python_2.5_diff.out
sed 's/^X//' >lang_python_2.5_diff.out << 'fadccdaa78dd176e58e4061ef4ede452'
XIndex: Makefile
X===================================================================
XRCS file: /home/FreeBSD/pcvs/ports/lang/python25/Makefile,v
Xretrieving revision 1.159
Xdiff -u -r1.159 Makefile
X--- Makefile	2 Feb 2010 22:00:24 -0000	1.159
X+++ Makefile	4 Apr 2010 05:05:06 -0000
X@@ -89,11 +89,6 @@
X CONFIGURE_ARGS+=	--without-pymalloc
X .endif
X 
X-.if ${ARCH} == i386
X-PLIST_SUB+=	X86_ONLY=""
X-.else
X-PLIST_SUB+=	X86_ONLY="@comment "
X-.endif
X .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
X PLIST_SUB+=	32BIT_ONLY="@comment "
X .else
XIndex: pkg-plist
X===================================================================
XRCS file: /home/FreeBSD/pcvs/ports/lang/python25/pkg-plist,v
Xretrieving revision 1.75
Xdiff -u -r1.75 pkg-plist
X--- pkg-plist	26 Nov 2009 14:04:18 -0000	1.75
X+++ pkg-plist	4 Apr 2010 05:05:29 -0000
X@@ -674,7 +674,7 @@
X %%32BIT_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/dl.so
X %%PYTHON_LIBDIR%%/lib-dynload/fcntl.so
X %%PYTHON_LIBDIR%%/lib-dynload/grp.so
X-%%X86_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/imageop.so
X+%%32BIT_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/imageop.so
X %%PYTHON_LIBDIR%%/lib-dynload/itertools.so
X %%PYTHON_LIBDIR%%/lib-dynload/math.so
X %%PYTHON_LIBDIR%%/lib-dynload/mmap.so
X@@ -685,7 +685,7 @@
X %%PYTHON_LIBDIR%%/lib-dynload/pyexpat.so
X %%PYTHON_LIBDIR%%/lib-dynload/readline.so
X %%PYTHON_LIBDIR%%/lib-dynload/resource.so
X-%%X86_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/rgbimg.so
X+%%32BIT_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/rgbimg.so
X %%PYTHON_LIBDIR%%/lib-dynload/select.so
X %%PYTHON_LIBDIR%%/lib-dynload/strop.so
X %%PYTHON_LIBDIR%%/lib-dynload/syslog.so
fadccdaa78dd176e58e4061ef4ede452
echo x - lang_python_2.6_diff.out
sed 's/^X//' >lang_python_2.6_diff.out << '4689ead7e4e3879f4a5a990cfb1108d6'
XIndex: Makefile
X===================================================================
XRCS file: /home/FreeBSD/pcvs/ports/lang/python26/Makefile,v
Xretrieving revision 1.165
Xdiff -u -r1.165 Makefile
X--- Makefile	26 Nov 2009 22:21:19 -0000	1.165
X+++ Makefile	22 Apr 2010 01:59:31 -0000
X@@ -116,11 +116,6 @@
X CONFIGURE_ARGS+=	--without-pymalloc
X .endif
X 
X-.if ${ARCH} == i386
X-PLIST_SUB+=	X86_ONLY=""
X-.else
X-PLIST_SUB+=	X86_ONLY="@comment "
X-.endif
X .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
X PLIST_SUB+=	32BIT_ONLY="@comment "
X .else
XIndex: pkg-plist
X===================================================================
XRCS file: /home/FreeBSD/pcvs/ports/lang/python26/pkg-plist,v
Xretrieving revision 1.79
Xdiff -u -r1.79 pkg-plist
X--- pkg-plist	26 Nov 2009 22:21:20 -0000	1.79
X+++ pkg-plist	22 Apr 2010 01:59:31 -0000
X@@ -820,7 +820,7 @@
X %%PYTHON_LIBDIR%%/lib-dynload/fcntl.so
X %%PYTHON_LIBDIR%%/lib-dynload/future_builtins.so
X %%PYTHON_LIBDIR%%/lib-dynload/grp.so
X-%%X86_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/imageop.so
X+%%32BIT_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/imageop.so
X %%PYTHON_LIBDIR%%/lib-dynload/itertools.so
X %%PYTHON_LIBDIR%%/lib-dynload/math.so
X %%PYTHON_LIBDIR%%/lib-dynload/mmap.so
4689ead7e4e3879f4a5a990cfb1108d6
echo x - patch-Modules-_ctypes-libffi-configure
sed 's/^X//' >patch-Modules-_ctypes-libffi-configure << '9e168a36d7b9d35d73fc07465fd7d8c8'
X--- Modules/_ctypes/libffi/configure.orig	2008-05-24 00:06:50.000000000 +0900
X+++ Modules/_ctypes/libffi/configure	2008-10-09 20:24:02.000000000 +0900
X@@ -4725,7 +4725,7 @@
X   rm -rf conftest*
X   ;;
X 
X-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
X+amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|powerpc-*-freebsd*| \
X s390*-*linux*|sparc*-*linux*)
X   # Find out which ABI we are using.
X   echo 'int i;' > conftest.$ac_ext
9e168a36d7b9d35d73fc07465fd7d8c8
echo x - patch-Modules-_ctypes-libffi-src-powerpc-ffitarget
sed 's/^X//' >patch-Modules-_ctypes-libffi-src-powerpc-ffitarget << '244787706daffd8f41f5cbaea3c00dc9'
X--- Modules/_ctypes/libffi/src/powerpc/ffitarget.h.orig	2009-12-28 12:29:03.000000000 +0000
X+++ Modules/_ctypes/libffi/src/powerpc/ffitarget.h	2009-12-28 12:30:11.000000000 +0000
X@@ -78,6 +78,8 @@
X   FFI_SYSV,
X   FFI_GCC_SYSV,
X   FFI_LINUX64,
X+  FFI_LINUX,
X+  FFI_LINUX_SOFT_FLOAT,
X   FFI_DEFAULT_ABI = FFI_SYSV,
X #endif
X 
244787706daffd8f41f5cbaea3c00dc9
exit