From 04b4332e8476769c558b3c75c5b88792ac0c95a3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 4 Nov 2010 22:39:28 +0100
Subject: add zlib dependency, fix binascii module build

---
 package/python2/Makefile                |  5 +++--
 package/python2/patches/patch-configure |  4 ++--
 package/python2/patches/patch-setup_py  | 13 ++++++++++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'package/python2')

diff --git a/package/python2/Makefile b/package/python2/Makefile
index 2325a51d1..96452b025 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -5,11 +5,12 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		python2
 PKG_VERSION:=		2.7
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		35f56b092ecf39a6bd59d64f142aae0f
 PKG_DESCR:=		Python scripting language (Version 2)
 PKG_SECTION:=		lang
-PKG_DEPENDS:=		libpthread
+PKG_DEPENDS:=		libpthread zlib
+PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.python.org/
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
 
diff --git a/package/python2/patches/patch-configure b/package/python2/patches/patch-configure
index 788a6c14c..b2c0f2ccd 100644
--- a/package/python2/patches/patch-configure
+++ b/package/python2/patches/patch-configure
@@ -1,5 +1,5 @@
 --- Python-2.7.orig/configure	2010-05-28 17:28:47.000000000 +0200
-+++ Python-2.7/configure	2010-11-04 17:41:01.981773166 +0100
++++ Python-2.7/configure	2010-11-04 22:17:32.000000000 +0100
 @@ -2972,12 +2972,12 @@ fi
  $as_echo_n "checking MACHDEP... " >&6; }
  if test -z "$MACHDEP"
@@ -20,7 +20,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking machine type as reported by uname -m" >&5
  $as_echo_n "checking machine type as reported by uname -m... " >&6; }
 -ac_sys_machine=`uname -m`
-+ac_sys_machine=@@CPU_ARCH@@
++ac_sys_machine=i586
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_sys_machine" >&5
  $as_echo "$ac_sys_machine" >&6; }
  
diff --git a/package/python2/patches/patch-setup_py b/package/python2/patches/patch-setup_py
index c0806af13..20739d746 100644
--- a/package/python2/patches/patch-setup_py
+++ b/package/python2/patches/patch-setup_py
@@ -1,5 +1,5 @@
 --- Python-2.7.orig/setup.py	2010-06-27 14:36:16.000000000 +0200
-+++ Python-2.7/setup.py	2010-09-25 22:04:01.234088816 +0200
++++ Python-2.7/setup.py	2010-11-04 22:25:30.000000000 +0100
 @@ -21,7 +21,7 @@ from distutils.spawn import find_executa
  COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
  
@@ -46,3 +46,14 @@
  
      def get_platform(self):
          # Get value of sys.platform
+@@ -347,8 +317,8 @@ class PyBuildExt(build_ext):
+ 
+     def detect_modules(self):
+         # Ensure that /usr/local is always used
+-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+-        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++        #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
++        #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ 
+         # Add paths specified in the environment variables LDFLAGS and
+         # CPPFLAGS for header and library files.
-- 
cgit v1.2.3