浏览代码

fix cross-compile on MacOS X host

Waldemar Brodkorb 15 年之前
父节点
当前提交
cb78e74dce
共有 2 个文件被更改,包括 21 次插入2 次删除
  1. 4 2
      package/python2/Makefile
  2. 17 0
      package/python2/patches/patch-configure

+ 4 - 2
package/python2/Makefile

@@ -13,7 +13,7 @@ PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.python.org/
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
 
-PKG_HOST_DEPENDS:=	!netbsd !openbsd !cygwin !darwin
+PKG_HOST_DEPENDS:=	!netbsd !openbsd !cygwin
 
 DISTFILES=		Python-${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/Python-${PKG_VERSION}
@@ -23,15 +23,17 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,PYTHON2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 MAKE_ENV+=		OPT="$(TARGET_CFLAGS)" \
+			RANLIB="${TARGET_CROSS}ranlib" \
 			HOSTPYTHON=./hostpython \
 			HOSTPGEN=./Parser/hostpgen
 CONFIGURE_ENV+=		OPT="$(TARGET_CFLAGS)" \
 			ac_cv_have_long_long_format=yes
 CONFIGURE_ARGS:=	--with-threads \
+			--disable-toolbox-glue \
 			--with-system-ffi \
 			--without-cxx-main
 
-pre-configure:
+post-extract:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
 		OPT="$(HOSTCFLAGS)" \
 		./configure --without-cxx-main --without-threads \

+ 17 - 0
package/python2/patches/patch-configure

@@ -0,0 +1,17 @@
+--- 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
+@@ -2972,12 +2972,12 @@ fi
+ $as_echo_n "checking MACHDEP... " >&6; }
+ if test -z "$MACHDEP"
+ then
+-	ac_sys_system=`uname -s`
++	ac_sys_system=Linux
+ 	if test "$ac_sys_system" = "AIX" \
+ 	-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
+ 		ac_sys_release=`uname -v`
+ 	else
+-		ac_sys_release=`uname -r`
++		ac_sys_release=2.6
+ 	fi
+ 	ac_md_system=`echo $ac_sys_system |
+ 			   tr -d '/ ' | tr '[A-Z]' '[a-z]'`