From 98a66da9056cbe37bb5b51f6354fb67f6cf5d4b4 Mon Sep 17 00:00:00 2001 From: Marco Mariani Date: Fri, 2 Jan 2015 11:48:59 +0100 Subject: [PATCH] removed reference to ARM from audiostream/pyparsing pyparsing is pure python, and AUDIOSTREAM_ROOT is not used anywhere. The audiostream module builds both in arm and x86 without setting the envvar. --- recipes/audiostream/recipe.sh | 1 - recipes/pyparsing/recipe.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/recipes/audiostream/recipe.sh b/recipes/audiostream/recipe.sh index 15cd9019a4..1cf22e738c 100644 --- a/recipes/audiostream/recipe.sh +++ b/recipes/audiostream/recipe.sh @@ -26,7 +26,6 @@ function build_audiostream() { export JNI_PATH=$JNI_PATH export CFLAGS="$CFLAGS -I$JNI_PATH/sdl/include -I$JNI_PATH/sdl_mixer/" export LDFLAGS="$LDFLAGS -lm -L$LIBS_PATH" - export AUDIOSTREAM_ROOT="$BUILD_audiostream/build/audiostream/armeabi-v7a" try cd $BUILD_audiostream $HOSTPYTHON setup.py build_ext &>/dev/null try find . -iname '*.pyx' -exec $CYTHON {} \; diff --git a/recipes/pyparsing/recipe.sh b/recipes/pyparsing/recipe.sh index 12e48026b2..14b4c65ed5 100644 --- a/recipes/pyparsing/recipe.sh +++ b/recipes/pyparsing/recipe.sh @@ -22,7 +22,6 @@ function shouldbuild_pyparsing() { function build_pyparsing() { cd $BUILD_pyparsing push_arm - export EXTRA_CFLAGS="--host linux-armv" try $HOSTPYTHON setup.py install -O2 pop_arm }