From c1bffbbc368e86272e92915132957e3bfd1440b3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 29 Apr 2011 15:45:19 +0200 Subject: [PATCH] Revert "TwistedWords: convert to python egg package" This reverts commit 46c835c8a4370ab95d9095a00f7f0d05ccd1a7f4. --- packages/python/web/TwistedWords/build | 8 +++++++- packages/python/web/TwistedWords/install | 7 +------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/python/web/TwistedWords/build b/packages/python/web/TwistedWords/build index 99e018af94..366092a3f9 100755 --- a/packages/python/web/TwistedWords/build +++ b/packages/python/web/TwistedWords/build @@ -27,7 +27,13 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" cd $PKG_BUILD -python setup.py build --cross-compile bdist_egg --exclude-source-files +python setup.py build --cross-compile +python setup.py install -O1 --skip-build --prefix /usr --root .install # install to toolchain because its needed for other twisted modules python setup.py install -O1 --skip-build --prefix $ROOT/$TOOLCHAIN + +find .install -name "*.py" -exec rm -rf "{}" ";" +find .install -name "*.pyo" -exec rm -rf "{}" ";" + +rm -rf .install/usr/lib/python*/site-packages/twisted/words/test diff --git a/packages/python/web/TwistedWords/install b/packages/python/web/TwistedWords/install index d2be73015e..a9c8b9924b 100755 --- a/packages/python/web/TwistedWords/install +++ b/packages/python/web/TwistedWords/install @@ -22,9 +22,4 @@ . config/options $1 -PKG_SRC_DIR=`ls -d $PKG_BUILD` - -PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`" -export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages" - -$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg +cp -PR $PKG_BUILD/.install/* $INSTALL