[gtk-osx: 10/48] Move CFLAGS and PYTHON_CONFIGURE_OPTS from jhbuild to pipenv install.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx: 10/48] Move CFLAGS and PYTHON_CONFIGURE_OPTS from jhbuild to pipenv install.
- Date: Tue, 14 May 2019 23:57:20 +0000 (UTC)
commit 318fa147b9cc36bb0ec68782d3de7fa2b54a6dec
Author: John Ralls <jralls ceridwen us>
Date: Fri Nov 9 12:43:44 2018 +0900
Move CFLAGS and PYTHON_CONFIGURE_OPTS from jhbuild to pipenv install.
gtk-osx-setup.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gtk-osx-setup.sh b/gtk-osx-setup.sh
index c3270af..4d86bde 100755
--- a/gtk-osx-setup.sh
+++ b/gtk-osx-setup.sh
@@ -149,8 +149,6 @@ export PYTHONPATH=$PYTHONPATH
export PIPENV_DOTENV_LOCATION=$DEVPREFIX/etc/pipenv-env
export PIPENV_PIPFILE=$DEVPREFIX/etc/Pipfile
export PYENV_ROOT=$PYENV_ROOT
-export CFLAGS="-I$(xcrun --show-sdk-path)/usr/include"
-export PYTHON_CONFIGURE_OPTS="--enable-shared"
exec pipenv run jhbuild \$@
EOF
@@ -193,9 +191,13 @@ fi
# with Py3 so remove it.
pip uninstall --yes enum34
+SDKROOT=`xcrun --show-sdk-path`
+
export PIPENV_DOTENV_LOCATION=$DEVPREFIX/etc/pipenv-env
export PIPENV_PIPFILE=$DEVPREFIX/etc/Pipfile
export PATH=$PYENV_ROOT/shims:$PATH
+export CFLAGS="-isysroot $SDKROOT -I$SDKROOT/usr/include"
+export PYTHON_CONFIGURE_OPTS="--enable-shared"
pipenv install
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]