[gimp/wip/Jehan/investigate-win-CI-bug: 2/2] DO NOT MERGE!
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/Jehan/investigate-win-CI-bug: 2/2] DO NOT MERGE!
- Date: Mon, 11 May 2020 11:16:29 +0000 (UTC)
commit 3069fa74345c245d2a28e64e340c40de84b52bea
Author: Jehan <jehan girinstud io>
Date: Mon May 11 08:32:48 2020 +0200
DO NOT MERGE!
Just a test build to help upstream to investigate their bug.
Or at least see if this is not fixed already in their master code.
https://github.com/mesonbuild/meson/issues/6115#issuecomment-626345479
.gitlab-ci.yml | 2 +-
build/windows/crossbuild-gitlab-ci/build-deps.sh | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2bc22cbeb..78d5d920cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -190,7 +190,7 @@ deps-win64:
gcc-mingw-w64-x86-64
g++-mingw-w64-x86-64
git
- meson
+ ninja-build
pkg-config
python3-distutils
python3-docutils
diff --git a/build/windows/crossbuild-gitlab-ci/build-deps.sh
b/build/windows/crossbuild-gitlab-ci/build-deps.sh
index 865d051c48..9a1debf706 100644
--- a/build/windows/crossbuild-gitlab-ci/build-deps.sh
+++ b/build/windows/crossbuild-gitlab-ci/build-deps.sh
@@ -1,4 +1,14 @@
crossroad source msys2
+
+git clone https://github.com/mesonbuild/meson.git
+cd meson
+export PYTHONPATH=$CROSSROAD_PREFIX/lib/python3.8/site-packages/:$PYTHONPATH
+python3 ./setup.py build
+python3 ./setup.py install --prefix=$CROSSROAD_PREFIX
+cd ..
+
+echo "XXX MESON: `which meson` XXX"
+
mkdir _deps && cd _deps
# babl
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]