diff options
author | Vlad Glagolev | 2015-02-21 13:09:23 +0300 |
---|---|---|
committer | Vlad Glagolev | 2015-02-21 13:09:23 +0300 |
commit | af34d7353faa1ed5653d359735d4beda28da584a (patch) | |
tree | 7ab8654216f9a7333f8dca743b292989baff6d13 /FUNCTIONS | |
parent | 7b023bd603824bf5113d9c006ad7bd11b51f425d (diff) |
Revert "fix builds involving python3.3"
This reverts commit ee71c06a22645712994fd33e6fc87fdd660f749b.
Conflicts:
ChangeLog
Usage of such stuff is *UNACCEPTABLE*. We get a ton of grep errors and extra
calls for the spells which DO NOT DEPEND on any version of python!
See your own compile logs and super debug sorcery logs for more info.
Diffstat (limited to 'FUNCTIONS')
-rwxr-xr-x | FUNCTIONS | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -2,11 +2,6 @@ . $GRIMOIRE/libgcc . $GRIMOIRE/config_query_multi.function -if is_depends_enabled $SPELL python3;then - VV=`installed_version python3 | cut -c-3` && - PYTHON3=python${VV} -fi - QT5DIR=$INSTALL_ROOT/opt/qt5 qt5_build() { export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig" @@ -453,7 +448,7 @@ function default_build_python() { ## Default build for Python 3 spell. #------------------------------------------------------------------------- function default_build_python3() { - $PYTHON3 setup.py build "$@" + python3 setup.py build "$@" } #------------------------------------------------------------------------- @@ -467,7 +462,7 @@ function default_install_python() { ## Default install for Python 3 spell. #------------------------------------------------------------------------- function default_install_python3() { - $PYTHON3 setup.py install --root "$INSTALL_ROOT/" "$@" + python3 setup.py install --root "$INSTALL_ROOT/" "$@" } #------------------------------------------------------------------------- |