فهرست منبع

fix compile under Darwin

Waldemar Brodkorb 13 سال پیش
والد
کامیت
c393e6d33d
1فایلهای تغییر یافته به همراه8 افزوده شده و 7 حذف شده
  1. 8 7
      package/python/Makefile

+ 8 - 7
package/python/Makefile

@@ -7,44 +7,45 @@ PKG_NAME:=		python
 PKG_VERSION:=		3.1.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		f1317dbb2398374d6691edd5bff1b91d
-PKG_DESCR:=		Python scripting language
+PKG_DESCR:=		Python scripting language (Version 3)
 PKG_SECTION:=		lang
 PKG_URL:=		http://www.python.org/
 PKG_SITES:=		http://www.python.org/ftp/python/3.1.1/
 
-PKG_HOST_DEPENDS:=	!netbsd !openbsd !cygwin !darwin
+PKG_HOST_DEPENDS:=	!netbsd !openbsd !cygwin
 
 DISTFILES=		Python-${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/Python-${PKG_VERSION}
 
-DISMOD:=		readline _curses _curses_panel _tkinter nis
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PYTHON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 MAKE_ENV+=		OPT="$(TARGET_CFLAGS)" \
 			HOSTPYTHON=./hostpython \
-			HOSTPGEN=./Parser/hostpgen \
-			PYTHON_DISABLE_MODULES="$(DISMOD)"
+			HOSTPGEN=./Parser/hostpgen
 CONFIGURE_ENV+=		OPT="$(TARGET_CFLAGS)"
 CONFIGURE_ARGS:=	--with-threads \
 			--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 \
 		--prefix=$(STAGING_TOOLS) \
 	);
 	$(MAKE) -C ${WRKBUILD} python Parser/pgen
+	$(MAKE) -C ${WRKBUILD} install
 	${CP} ${WRKBUILD}/Parser/pgen ${STAGING_TOOLS}/bin/pgen
 	${CP} ${WRKBUILD}/python ${STAGING_TOOLS}/bin/hostpython
 	${CP} ${WRKBUILD}/Parser/pgen ${WRKBUILD}/Parser/hostpgen
 	${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython
 	$(MAKE) -C ${WRKBUILD} distclean
 
+pre-configure:
+	$(SED) "s#@@CPU_ARCH@@#$(CPU_ARCH)#" ${WRKBUILD}/configure
+
 post-install:
 	${INSTALL_DIR} ${IDIR_PYTHON}/usr/bin ${IDIR_PYTHON}/usr/lib
 	${INSTALL_DIR} ${IDIR_PYTHON}/usr/lib/python3.1