[gimp-macos-build] Fix libxml2 related issue
- From: Alex Samorukov <asamorukov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp-macos-build] Fix libxml2 related issue
- Date: Wed, 28 Aug 2019 16:31:53 +0000 (UTC)
commit 66dae54caba2d568364e2ce82828a415af7283d9
Author: Oleksii Samorukov <oleksii_samorukov mckinsey com>
Date: Wed Aug 28 18:31:51 2019 +0200
Fix libxml2 related issue
.circleci/config.yml | 3 ++-
jhbuildrc-gtk-osx-gimp | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 49870c5..8451f25 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,7 +53,8 @@ jobs:
echo 'export SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX10.9.sdk' >> ~/.profile
- run:
name: Bootstrap
- command: source ~/.profile && jhbuild build python meta-gtk-osx-freetype meta-gtk-osx-bootstrap
meta-gtk-osx-core
+ # build python2 and re-install libxml2 to use it
+ command: source ~/.profile && jhbuild build python && jhbuild build -f libxml2 &&
PYTHON=$HOME/gtk/inst/bin/python build meta-gtk-osx-freetype meta-gtk-osx-bootstrap meta-gtk-osx-core
- run:
name: Cleanup
command: find ~/gtk/source -type d -mindepth 1 -maxdepth 1 | xargs -I% rm -rf %/*
diff --git a/jhbuildrc-gtk-osx-gimp b/jhbuildrc-gtk-osx-gimp
index efe2b58..a7efe48 100644
--- a/jhbuildrc-gtk-osx-gimp
+++ b/jhbuildrc-gtk-osx-gimp
@@ -154,6 +154,9 @@ environ_prepend('OBJCFLAGS', "-O3")
#
# os.environ["CC"] = "/usr/bin/gcc-4.0"
+# Fix Python detection
+module_extra_env['itstool'] = { "PYTHON": os.path.expanduser("~/gtk/inst/bin/python") }
+
# And more...
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]