diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-25 22:23:10 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-25 22:23:10 +0200 |
commit | d48b7c670c65ccdf858abcdd695c1bb67d5f61b4 (patch) | |
tree | dd1904e961a1400a809cbe3999e7d3aef4223ecb /package/python2/Makefile | |
parent | 8b32eefb9caa9e2ac30505510b588ff02f6c87b8 (diff) |
fix packaging bug, reported by joerg
loading of python modules must be disabled, otherwise
they are renamed/disabled. To disable modules we need to
patch setup.py, PYTHON_DIABLED_MODULES are no longer recognized.
Diffstat (limited to 'package/python2/Makefile')
-rw-r--r-- | package/python2/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/package/python2/Makefile b/package/python2/Makefile index 4f8da7be3..2bf3f0957 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 35f56b092ecf39a6bd59d64f142aae0f PKG_DESCR:= Python scripting language (Version 2) PKG_SECTION:= lang +PKG_DEPENDS:= libpthread PKG_URL:= http://www.python.org/ PKG_SITES:= http://www.python.org/ftp/python/${PKG_VERSION}/ @@ -17,16 +18,13 @@ 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,PYTHON2,${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)" \ ac_cv_have_long_long_format=yes CONFIGURE_ARGS:= --with-threads \ @@ -49,11 +47,11 @@ pre-configure: post-install: ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/bin ${IDIR_PYTHON2}/usr/lib ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/lib/python2.7 - ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/include/python2.7 + #${INSTALL_DIR} ${IDIR_PYTHON2}/usr/include/python2.7 ${INSTALL_BIN} ${WRKINST}/usr/bin/python ${IDIR_PYTHON2}/usr/bin ${CP} ${WRKINST}/usr/lib/libpython*.so* ${IDIR_PYTHON2}/usr/lib ${CP} ${WRKINST}/usr/lib/python2.7/* ${IDIR_PYTHON2}/usr/lib/python2.7 - ${CP} ${WRKINST}/usr/include/python2.7/* ${IDIR_PYTHON2}/usr/include/python2.7 + #${CP} ${WRKINST}/usr/include/python2.7/* ${IDIR_PYTHON2}/usr/include/python2.7 -find ${IDIR_PYTHON2} -name \*.pyo -exec rm {} \; include ${TOPDIR}/mk/pkg-bottom.mk |