From b322425c6f272f3e2bdf2c6ff064cbf5178f0da6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 9 Jun 2011 17:16:07 +0200 Subject: [PATCH] Revert "Cheetah: convert to python egg package" This reverts commit 42ac97e3bcda0ca777ddfc6d0e9c8e456d0fb15f. --- packages/python/devel/Cheetah/build | 8 +++++++- packages/python/devel/Cheetah/install | 7 +------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/python/devel/Cheetah/build b/packages/python/devel/Cheetah/build index 3a7c2afbd8..3d37a7f15b 100755 --- a/packages/python/devel/Cheetah/build +++ b/packages/python/devel/Cheetah/build @@ -27,4 +27,10 @@ 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 + +find .install -name "*.py" -exec rm -rf "{}" ";" +find .install -name "*.pyo" -exec rm -rf "{}" ";" + +rm -rf .install/usr/bin diff --git a/packages/python/devel/Cheetah/install b/packages/python/devel/Cheetah/install index d2be73015e..a9c8b9924b 100755 --- a/packages/python/devel/Cheetah/install +++ b/packages/python/devel/Cheetah/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