From 2fb71db80e733ab6633974b24ca9869a0cf971dd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 4 Nov 2010 21:12:06 +0100 Subject: hopefully fix compile on 64 Bit host --- package/python2/Makefile | 5 ++++- package/python2/patches/patch-configure | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package/python2/Makefile b/package/python2/Makefile index 67d8e29ba..44dda1d1b 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= python2 PKG_VERSION:= 2.7 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 35f56b092ecf39a6bd59d64f142aae0f PKG_DESCR:= Python scripting language (Version 2) PKG_SECTION:= lang @@ -46,6 +46,9 @@ post-extract: ${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython $(MAKE) -C ${WRKBUILD} distclean +pre-configure: + $(SED) "s#@@CPU_ARCH@@#$(CPU_ARCH)#" ${WRKBUILD}/configure + post-install: ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/bin ${IDIR_PYTHON2}/usr/lib ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/lib/python2.7 diff --git a/package/python2/patches/patch-configure b/package/python2/patches/patch-configure index 8c9893234..788a6c14c 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 14:13:05.000000000 +0100 ++++ Python-2.7/configure 2010-11-04 17:41:01.981773166 +0100 @@ -2972,12 +2972,12 @@ fi $as_echo_n "checking MACHDEP... " >&6; } if test -z "$MACHDEP" @@ -15,3 +15,12 @@ fi ac_md_system=`echo $ac_sys_system | tr -d '/ ' | tr '[A-Z]' '[a-z]'` +@@ -3150,7 +3150,7 @@ EXPORT_MACOSX_DEPLOYMENT_TARGET='#' + + { $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@@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_sys_machine" >&5 + $as_echo "$ac_sys_machine" >&6; } + -- cgit v1.2.3