1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
From: Sebastian Ramacher <sramacher@debian.org>
Date: Tue, 17 Apr 2018 21:11:53 +0200
Subject: Do not abort if libtool, meson or ninja-build are missing
They are not used anywhere.
---
make/configure.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/make/configure.py b/make/configure.py
index b02a3af..53445df 100644
--- a/make/configure.py
+++ b/make/configure.py
@@ -1661,12 +1661,12 @@ try:
autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', 'autoconf', abort=True, minversion=([2,71,0] if build_tuple.match('*-*-darwin*') else [2,69,0]) )
automake = ToolProbe( 'AUTOMAKE.exe', 'automake', 'automake', abort=True, minversion=[1,13,0] )
- libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', 'libtool', abort=True )
+ libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', 'libtool', abort=False )
lipo = ToolProbe( 'LIPO.exe', 'lipo', 'lipo', abort=False )
pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkgconfig', 'pkg-config', abort=True, minversion=[0,27,0] )
- meson = ToolProbe( 'MESON.exe', 'meson', 'meson', abort=True, minversion=[0,47,0] )
+ meson = ToolProbe( 'MESON.exe', 'meson', 'meson', abort=False, minversion=[0,47,0] )
nasm = ToolProbe( 'NASM.exe', 'asm', 'nasm', abort=True, minversion=[2,13,0] )
- ninja = ToolProbe( 'NINJA.exe', 'ninja', 'ninja-build', 'ninja', abort=True )
+ ninja = ToolProbe( 'NINJA.exe', 'ninja', 'ninja-build', 'ninja', abort=False )
xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', 'xcodebuild', abort=(True if (not xcode_opts['disabled'] and (build_tuple.match('*-*-darwin*') and cross is None)) else False), versionopt='-version', minversion=[10,3,0] )
|
