- fixes for x32 arch

diff --git a/python-lib64.patch b/python-lib64.patch
index 95d8df3c42f427c72fefc7ef02e35f2e6b7f7c9e..ada11c954de9435c62221b1bee24f75989e110e9 100644 (file)
--- 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

diff --git a/python.spec b/python.spec
index a834aeea9934fb00a80e830aac8be4d5f48b3c43..91e9deed40f668d96fefacb3782e0ee506d50fa0 100644 (file)
--- 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}" \