[Libreoffice-commits] .: python/makefile.mk python/Python.mipsel-py4305.patch
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jul 12 08:35:52 PDT 2012
python/Python.mipsel-py4305.patch | 49 ++++++++++++++++++++++++++++++++++++++
python/makefile.mk | 3 +-
2 files changed, 51 insertions(+), 1 deletion(-)
New commits:
commit 37d5ee911bcaa5c9c1ac6bf868a3902dd2dfd77f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 12 16:34:01 2012 +0100
get python building under mipsel
Change-Id: I28e4d96fb48420a19e51d52b89895625e7f9ba93
diff --git a/python/Python.mipsel-py4305.patch b/python/Python.mipsel-py4305.patch
new file mode 100644
index 0000000..3831aa9
--- /dev/null
+++ b/python/Python.mipsel-py4305.patch
@@ -0,0 +1,49 @@
+--- misc/Python-2.6.1/Modules/_ctypes/libffi/configure
++++ misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure
+@@ -20426,10 +20426,10 @@ case "$host" in
+ ;;
+
+ mips-sgi-irix5.* | mips-sgi-irix6.*)
+- TARGET=MIPS; TARGETDIR=mips
++ TARGET=MIPS_IRIX; TARGETDIR=mips
+ ;;
+ mips*-*-linux*)
+- TARGET=MIPS; TARGETDIR=mips
++ TARGET=MIPS_LINUX; TARGETDIR=mips
+ ;;
+
+ powerpc*-*-linux* | powerpc-*-sysv*)
+@@ -20484,7 +20484,7 @@ echo "$as_me: error: \"libffi has not be
+ { (exit 1); exit 1; }; }
+ fi
+
+- if test x$TARGET = xMIPS; then
++ if expr x$TARGET : 'xMIPS' > /dev/null; then
+ MIPS_TRUE=
+ MIPS_FALSE='#'
+ else
+--- misc/Python-2.6.1/Modules/_ctypes/libffi/configure.ac
++++ misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure.ac
+@@ -106,10 +106,10 @@ case "$host" in
+ ;;
+
+ mips-sgi-irix5.* | mips-sgi-irix6.*)
+- TARGET=MIPS; TARGETDIR=mips
++ TARGET=MIPS_IRIX; TARGETDIR=mips
+ ;;
+ mips*-*-linux*)
+- TARGET=MIPS; TARGETDIR=mips
++ TARGET=MIPS_LINUX; TARGETDIR=mips
+ ;;
+
+ powerpc*-*-linux* | powerpc-*-sysv*)
+@@ -162,7 +162,7 @@ if test $TARGETDIR = unknown; then
+ AC_MSG_ERROR(["libffi has not been ported to $host."])
+ fi
+
+-AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
++AM_CONDITIONAL(MIPS,[expr x$TARGET : 'xMIPS' > /dev/null])
+ AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
+ AM_CONDITIONAL(X86, test x$TARGET = xX86)
+ AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
+
diff --git a/python/makefile.mk b/python/makefile.mk
index 62907bf..9311c75 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -58,7 +58,8 @@ PATCH_FILES=\
Python-2.6.1-nohardlink.patch \
Python-2.6.1-py2422.patch \
Python-2.6.1-py4768.patch \
- Python-2.6.1-svn-1.7.patch
+ Python-2.6.1-svn-1.7.patch \
+ Python.mipsel-py4305.patch
CONFIGURE_DIR=
More information about the Libreoffice-commits
mailing list