From 0453493b57ccc55f610e61ec1a0b9c26a0eefdae Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 24 May 2012 17:01:27 +0200 Subject: [PATCH] pyasn1: cleanup build and install scripts, dont use 'easy_install', dont depend on 'distribute' Signed-off-by: Stephan Raue --- packages/python/system/pyasn1/build | 3 ++- packages/python/system/pyasn1/install | 7 +------ packages/python/system/pyasn1/meta | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/python/system/pyasn1/build b/packages/python/system/pyasn1/build index a5c7622968..69832db409 100755 --- a/packages/python/system/pyasn1/build +++ b/packages/python/system/pyasn1/build @@ -27,4 +27,5 @@ 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 --root=./.install --prefix=/usr diff --git a/packages/python/system/pyasn1/install b/packages/python/system/pyasn1/install index f113043c99..85a37ef61d 100755 --- a/packages/python/system/pyasn1/install +++ b/packages/python/system/pyasn1/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 diff --git a/packages/python/system/pyasn1/meta b/packages/python/system/pyasn1/meta index c825f6e29c..48465f442d 100644 --- a/packages/python/system/pyasn1/meta +++ b/packages/python/system/pyasn1/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="http://sourceforge.net/projects/pyasn1/" PKG_URL="$SOURCEFORGE_SRC/pyasn1/pyasn1-devel/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="Python distribute" -PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross" +PKG_DEPENDS="Python" +PKG_BUILD_DEPENDS="toolchain Python distutilscross" PKG_PRIORITY="optional" PKG_SECTION="python/system" PKG_SHORTDESC="pyasn1: ASN.1 types and codecs"