slackware-current/source/d/gyp/gyp-ninja-build.patch
Patrick J Volkerding 4490f14406 Sat May 30 21:31:07 UTC 2020
ap/mpg123-1.26.1-x86_64-1.txz:  Upgraded.
d/gyp-20200512_caa60026-x86_64-1.txz:  Added.
l/Mako-1.1.3-x86_64-1.txz:  Upgraded.
l/imagemagick-7.0.10_15-x86_64-1.txz:  Upgraded.
l/librsvg-2.48.5-x86_64-1.txz:  Upgraded.
l/mozilla-nss-3.53-x86_64-1.txz:  Upgraded.
l/vte-0.60.3-x86_64-1.txz:  Upgraded.
n/libgpg-error-1.38-x86_64-1.txz:  Upgraded.
n/libqmi-1.24.14-x86_64-1.txz:  Upgraded.
extra/pure-alsa-system/mpg123-1.26.1-x86_64-1_alsa.txz:  Upgraded.
2020-05-31 08:59:52 +02:00

26 lines
1.4 KiB
Diff

diff -pruN gyp-0.1-gitfcd686f1.orig/pylib/gyp/generator/ninja.py gyp-0.1-gitfcd686f1/pylib/gyp/generator/ninja.py
--- gyp-0.1-gitfcd686f1.orig/pylib/gyp/generator/ninja.py 2019-08-14 09:05:50.000000000 +0000
+++ gyp-0.1-gitfcd686f1/pylib/gyp/generator/ninja.py 2019-08-14 09:19:26.668031638 +0000
@@ -2073,11 +2073,11 @@ def GenerateOutputForConfig(target_list,
# .c files. This should be handled by mspdbsrv, but rarely errors out with
# c1xx : fatal error C1033: cannot open program database
# By making the rules target separate pdb files this might be avoided.
- cc_command = ('ninja -t msvc -e $arch ' +
+ cc_command = ('ninja-build -t msvc -e $arch ' +
'-- '
'$cc /nologo /showIncludes /FC '
'@$out.rsp /c $in /Fo$out /Fd$pdbname_c ')
- cxx_command = ('ninja -t msvc -e $arch ' +
+ cxx_command = ('ninja-build -t msvc -e $arch ' +
'-- '
'$cxx /nologo /showIncludes /FC '
'@$out.rsp /c $in /Fo$out /Fd$pdbname_cc ')
@@ -2453,7 +2453,7 @@ def PerformBuild(data, configurations, p
options = params['options']
for config in configurations:
builddir = os.path.join(options.toplevel_dir, 'out', config)
- arguments = ['ninja', '-C', builddir]
+ arguments = ['ninja-build', '-C', builddir]
print('Building [%s]: %s' % (config, arguments))
subprocess.check_call(arguments)