1
0
Fork 0
mirror of git://slackware.nl/current.git synced 2025-01-30 08:38:10 +01:00
slackware-current/source/d/meson/meson.dont.exit.1.if.builddir.is.already.configured.patch
Patrick J Volkerding 6371ee337f Mon Sep 24 21:37:09 UTC 2018
d/Cython-0.28.5-x86_64-1.txz:  Upgraded.
d/help2man-1.47.7-x86_64-1.txz:  Upgraded.
d/meson-0.48.0-x86_64-1.txz:  Upgraded.
d/python-setuptools-40.4.3-x86_64-1.txz:  Upgraded.
l/M2Crypto-0.30.1-x86_64-1.txz:  Upgraded.
l/cairo-1.15.14-x86_64-1.txz:  Upgraded.
l/librsvg-2.44.4-x86_64-1.txz:  Upgraded.
l/pycairo-1.17.1-x86_64-1.txz:  Upgraded.
l/pycurl-7.43.0.2-x86_64-1.txz:  Upgraded.
l/pyparsing-2.2.1-x86_64-1.txz:  Upgraded.
n/ModemManager-1.8.2-x86_64-1.txz:  Upgraded.
n/bind-9.12.2_P2-x86_64-1.txz:  Upgraded.
  This update fixes security issues:
  There was a long-existing flaw in the documentation for ms-self, krb5-self,
  ms-subdomain, and krb5-subdomain rules in update-policy statements. Though
  the policies worked as intended, operators who configured their servers
  according to the misleading documentation may have thought zone updates were
  more restricted than they were; users of these rule types are advised to
  review the documentation and correct their configurations if necessary. New
  rule types matching the previously documented behavior will be introduced in
  a future maintenance release.
  named could crash during recursive processing of DNAME records when
  deny-answer-aliases was in use. This flaw is disclosed in CVE-2018-5740.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-5740
  (* Security fix *)
n/httpd-2.4.35-x86_64-1.txz:  Upgraded.
  This release fixes bugs and regressions in httpd-2.4.34, adds an
  apache2ctl -> apachectl symlink, and no longer automatically
  overwrites rc.httpd when upgraded.
2018-09-25 09:00:30 +02:00

29 lines
1.2 KiB
Diff

From 2f0285c7ef3a3dab71e8d6f4df92ef978470c553 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Mon, 24 Sep 2018 09:24:38 -0400
Subject: [PATCH] Return code 0 when builddir is already configured
This is a regression in Meson 0.48.0, commit 674ae46, Meson used to
exit(0) when running setup command in a builddir already configured.
Changing to exit(1) breaks some build tools that does "meson builddir
&& ninja -C builddir".
Closes #4247.
---
mesonbuild/mesonmain.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index cd925e51f2..dfad2e7848 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -113,7 +113,7 @@ def validate_dirs(self, dir1, dir2, reconfigure):
'\nIf build failures persist, manually wipe your build directory to clear any\n'
'stored system data.\n'
'\nTo change option values, run "meson configure" instead.')
- sys.exit(1)
+ sys.exit(0)
else:
if reconfigure:
print('Directory does not contain a valid build tree:\n{}'.format(build_dir))