[gtk-osx] Add Rust toolchain to the gtk-osx build environment.



commit ee92955caf5101d7e7b4668f7a169b672140f1a8
Author: John Ralls <jralls ceridwen us>
Date:   Mon Apr 12 14:05:15 2021 -0700

    Add Rust toolchain to the gtk-osx build environment.
    
    Required for building recent versions of librsvg.

 gtk-osx-setup.sh | 9 +++++++++
 1 file changed, 9 insertions(+)
---
diff --git a/gtk-osx-setup.sh b/gtk-osx-setup.sh
index bdacd3de..aca7959c 100755
--- a/gtk-osx-setup.sh
+++ b/gtk-osx-setup.sh
@@ -57,6 +57,8 @@ envvar DEV_SRC_ROOT "$DEVROOT/Source"
 envvar PYENV_INSTALL_ROOT "$DEV_SRC_ROOT/pyenv"
 envvar PYENV_ROOT "$DEVPREFIX/share/pyenv"
 envvar PIP_CONFIG_DIR "$HOME/.config/pip"
+envvar CARGO_HOME "$DEVPREFIX"
+envvar RUSTUP_HOME "$DEVPREFIX"
 
 export PYTHONWARNINGS=ignore:DEPRECATION::pip._internal.cli.base_command
 export PYTHONPATH="$PYTHONUSERBASE/lib/python/site-packages":"$PYTHONPATH"
@@ -130,6 +132,12 @@ if test ! -x "$NINJA" -a ! -x "$DEVPREFIX/bin/ninja"; then
     rm "$DEVPREFIX/ninja-mac.zip"
 fi
 
+#Install Rust (required for librsvg, which gtk needs to render its icons.)
+RUSTUP=`which rustup`
+if test ! -x "$RUSTUP" -a ! -x "$DEVPREFIX/bin/rustup"; then
+    curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal
+fi
+
 if test ! -d "$DEVPREFIX/etc" ; then
     mkdir -p "$DEVPREFIX/etc"
 fi
@@ -168,6 +176,7 @@ export PIPENV_DOTENV_LOCATION="$DEVPREFIX/etc/pipenv-env"
 export PIPENV_PIPFILE="$DEVPREFIX/etc/Pipfile"
 export PATH="$PYENV_ROOT/shims:$DEVPREFIX/bin:$PATH"
 export PYENV_ROOT="$PYENV_ROOT"
+export RUSTUP_HOME="$RUSTUP_HOME"
 
 exec pipenv run jhbuild \$@
 EOF


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