Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 1 | From 0e41b11b23c91293d1b39a8ec4cb80c68fb26ad7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 28 Apr 2022 07:35:31 -0700 |
| 4 | Subject: [PATCH] meson: Do not run git rev-parse during configure |
| 5 | |
| 6 | This option will try to deduce if babl is being built from git tree or |
| 7 | release tarball, there should be a better way like checking for .git |
| 8 | directory etc. instead of doing git operations needing network |
| 9 | |
| 10 | see |
| 11 | https://gitlab.gnome.org/GNOME/babl/-/commit/2dc7fc403fe427a889913ef0cfb71de85b4326ec#note_1439732 |
| 12 | |
| 13 | Upstream-Status: Pending |
| 14 | |
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 16 | --- |
| 17 | meson.build | 2 +- |
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 19 | |
| 20 | diff --git a/meson.build b/meson.build |
| 21 | index 7e7a935..649b456 100644 |
| 22 | --- a/meson.build |
| 23 | +++ b/meson.build |
| 24 | @@ -451,7 +451,7 @@ if git_bin.found() and run_command( |
| 25 | git_bin, |
| 26 | 'rev-parse', |
| 27 | '--is-inside-work-tree', |
| 28 | - check: true, |
| 29 | + check: false, |
| 30 | ).returncode() == 0 |
| 31 | git_version_h = vcs_tag( |
| 32 | input : 'git-version.h.in', |
| 33 | -- |
| 34 | 2.36.0 |
| 35 | |