[gtk-osx] Rename PYENV_VERSION to PYENV_PYTHON_VERSION



commit 18cd0e12797859eb8224e46429688f51208025e0
Author: John Ralls <jralls ceridwen us>
Date:   Sat Jan 15 18:21:40 2022 -0800

    Rename PYENV_VERSION to PYENV_PYTHON_VERSION
    
    Because it's the python version pyenv installs, not the version of pyenv.

 gtk-osx-setup.sh  | 8 ++++----
 jhbuildrc-gtk-osx | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gtk-osx-setup.sh b/gtk-osx-setup.sh
index 9e62846..ac0f753 100755
--- a/gtk-osx-setup.sh
+++ b/gtk-osx-setup.sh
@@ -96,8 +96,8 @@ fi
 #doesn't include a usable libpython for libxml2 to link against.
 
 export PYTHON_CONFIGURE_OPTS="--enable-shared"
-export PYENV_VERSION=3.10.0
-$PYENV install $PYENV_VERSION
+export PYENV_PYTHON_VERSION=3.10.0
+$PYENV install -v $PYENV_PYTHON_VERSION
 PIP="$PYENV_ROOT/shims/pip"
 $PIP install --upgrade --user pip
 
@@ -155,7 +155,7 @@ if test ! -d "$DEVPREFIX/etc" ; then
     mkdir -p "$DEVPREFIX/etc"
 fi
 
-PYENV_MINOR_VERSION=$(echo $PYENV_VERSION | cut -d . -f 1,2)
+PYENV_MINOR_VERSION=$(echo $PYENV_PYTHON_VERSION | cut -d . -f 1,2)
 cat  <<EOF > "$DEVPREFIX/etc/Pipfile"
 [[source]]
 url = "https://pypi.python.org/simple";
@@ -187,7 +187,7 @@ export PYTHONUSERBASE="$PYTHONUSERBASE"
 export PIPENV_DOTENV_LOCATION="$DEVPREFIX/etc/pipenv-env"
 export PIPENV_PIPFILE="$DEVPREFIX/etc/Pipfile"
 export PYENV_ROOT="$PYENV_ROOT"
-export PYENV_VERSION="$PYENV_VERSION"
+export PYENV_PYTHON_VERSION="$PYENV_PYTHON_VERSION"
 export PATH="$PYENV_ROOT/shims:$PATH"
 export CARGO_HOME="$CARGO_HOME"
 export RUSTUP_HOME="$RUSTUP_HOME"
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 22935be..1002bc6 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -628,7 +628,7 @@ else:
                        '--with-python-install-dir=' + _python_install_path)
     environ_append('PYTHONPATH', _python_install_path, ':')
     _python_library_path = os.path.join(os.environ['PYENV_ROOT'], 'versions',
-                                       os.environ['PYENV_VERSION'], 'lib')
+                                       os.environ['PYENV_PYTHON_VERSION'], 'lib')
     environ_append('LDFLAGS', '-L' + _python_library_path)
     os.environ['PYTHON'] = sys.executable
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]