[packages/python] - fixes for x32 arch

baggins baggins at pld-linux.org
Tue Dec 23 01:12:29 CET 2014


commit c2623236c93ef2c29e0444d9ce35d86277e305cc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Dec 23 00:14:57 2014 +0000

    - fixes for x32 arch

 python-lib64.patch | 11 +++++++++--
 python.spec        |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/python.spec b/python.spec
index a834aee..91e9dee 100644
--- a/python.spec
+++ b/python.spec
@@ -592,6 +592,7 @@ cp -a Lib/plat-linux2 Lib/plat-linux3
 %{__aclocal}
 %{__autoconf}
 %configure \
+	CC="%{__cc}" \
 	OPT="%{rpmcflags}" \
 	CPPFLAGS="%{rpmcppflags}" \
 	LDFLAGS="%{rpmldflags}" \
diff --git a/python-lib64.patch b/python-lib64.patch
index 95d8df3..ada11c9 100644
--- a/python-lib64.patch
+++ b/python-lib64.patch
@@ -1,7 +1,7 @@
 diff -Nur Python-2.5b2.orig/configure.ac Python-2.5b2/configure.ac
 --- Python-2.5b2.orig/configure.ac	2006-07-06 11:13:35.000000000 +0100
 +++ Python-2.5b2/configure.ac	2006-07-12 17:42:51.000000000 +0100
-@@ -503,6 +503,41 @@
+@@ -503,6 +503,44 @@
      ;;
  esac
  
@@ -35,6 +35,9 @@ diff -Nur Python-2.5b2.orig/configure.ac Python-2.5b2/configure.ac
 +powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
 +  LIB="lib64"
 +  ;;
++x86_64:no)
++  LIB="libx32"
++  ;;
 +*:*)
 +  LIB="lib"
 +  ;;
@@ -179,13 +182,17 @@ diff -Nur Python-2.5b2.orig/Makefile.pre.in Python-2.5b2/Makefile.pre.in
 diff -Nur Python-2.5b2.orig/Modules/getpath.c Python-2.5b2/Modules/getpath.c
 --- Python-2.5b2.orig/Modules/getpath.c	2006-07-10 02:18:57.000000000 +0100
 +++ Python-2.5b2/Modules/getpath.c	2006-07-12 17:42:51.000000000 +0100
-@@ -116,9 +116,17 @@
+@@ -116,9 +116,21 @@
  #define EXEC_PREFIX PREFIX
  #endif
  
 +#ifndef LIB_PYTHON
 +#if defined(__x86_64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__powerpc64__) || defined(__s390x__)
++#if defined(__ILP32__)
++#define LIB_PYTHON "libx32/python"
++#else
 +#define LIB_PYTHON "lib64/python"
++#endif
 +#else
 +#define LIB_PYTHON "lib/python"
 +#endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python.git/commitdiff/c2623236c93ef2c29e0444d9ce35d86277e305cc



More information about the pld-cvs-commit mailing list