From 58274b367a88030a28abc30a9d8bdac1efb7961b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 23 Dec 2014 07:53:15 +0000 Subject: [PATCH] - fixes for x32 arch - added xz BR --- python3-lib64.patch | 11 +++++++++-- python3.spec | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/python3-lib64.patch b/python3-lib64.patch index 2faac0d..a6c13e6 100644 --- a/python3-lib64.patch +++ b/python3-lib64.patch @@ -1,6 +1,6 @@ --- Python-3.3.1/configure.ac.orig 2013-04-18 16:31:07.244030129 +0200 +++ Python-3.3.1/configure.ac 2013-04-18 17:30:31.800622500 +0200 -@@ -769,6 +768,42 @@ +@@ -769,6 +768,45 @@ MULTIARCH=$($CC --print-multiarch 2>/dev/null) AC_SUBST(MULTIARCH) @@ -34,6 +34,9 @@ +powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) + LIB="lib64" + ;; ++x86_64:no) ++ LIB="libx32" ++ ;; +*:*) + LIB="lib" + ;; @@ -194,13 +197,17 @@ $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c --- Python-3.2.1.orig/Modules/getpath.c 2011-07-09 07:58:54.000000000 +0100 +++ Python-3.2.1/Modules/getpath.c 2011-07-12 22:21:48.000000000 +0100 -@@ -121,9 +121,17 @@ +@@ -121,9 +121,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/python3.spec b/python3.spec index 1c9fe7b..eec25f4 100644 --- a/python3.spec +++ b/python3.spec @@ -76,6 +76,7 @@ BuildRequires: tar >= 1:1.22 %{?with_info:BuildRequires: tetex-makeindex} %{?with_tkinter:BuildRequires: tix-devel >= 1:8.1.4-4} %{?with_tkinter:BuildRequires: tk-devel >= 8.4.3} +BuildRequires: xz-devel BuildRequires: zlib-devel Requires: %{name}-libs = %{epoch}:%{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -499,6 +500,7 @@ fi %{__autoconf} %configure \ + CC="%{__cc}" \ OPT="%{rpmcflags} -fno-caller-saves" \ CPPFLAGS="%{rpmcppflags}" \ LDFLAGS="%{rpmldflags}" \ -- 2.44.0