Accepting request 735273 from devel:tools:building
OBS-URL: https://build.opensuse.org/request/show/735273 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=46
This commit is contained in:
commit
d5115c4297
@ -1,48 +0,0 @@
|
||||
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
|
||||
index 3b58a07..9ef9207 100644
|
||||
--- a/mesonbuild/compilers/c.py
|
||||
+++ b/mesonbuild/compilers/c.py
|
||||
@@ -70,6 +70,7 @@ class CCompiler(CLikeCompiler, Compiler):
|
||||
#ifndef {symbol}
|
||||
{symbol};
|
||||
#endif
|
||||
+ return 0;
|
||||
}}'''
|
||||
return self.compiles(t.format(**fargs), env, extra_args=extra_args,
|
||||
dependencies=dependencies)
|
||||
diff --git a/mesonbuild/compilers/clike.py b/mesonbuild/compilers/clike.py
|
||||
index e923ff2..7ba8bd3 100644
|
||||
--- a/mesonbuild/compilers/clike.py
|
||||
+++ b/mesonbuild/compilers/clike.py
|
||||
@@ -375,6 +375,7 @@ class CLikeCompiler:
|
||||
#ifndef {symbol}
|
||||
{symbol};
|
||||
#endif
|
||||
+ return 0;
|
||||
}}'''
|
||||
return self.compiles(t.format(**fargs), env, extra_args=extra_args,
|
||||
dependencies=dependencies)
|
||||
@@ -583,6 +584,7 @@ class CLikeCompiler:
|
||||
{prefix}
|
||||
int main(int argc, char **argv) {{
|
||||
{type} something;
|
||||
+ return 0;
|
||||
}}'''
|
||||
if not self.compiles(t.format(**fargs), env, extra_args=extra_args,
|
||||
dependencies=dependencies)[0]:
|
||||
@@ -661,6 +663,7 @@ class CLikeCompiler:
|
||||
#include <stdio.h>
|
||||
int main(int argc, char *argv[]) {{
|
||||
printf ("{fmt}", {cast} {f}());
|
||||
+ return 0;
|
||||
}}'''.format(**fargs)
|
||||
res = self.run(code, env, extra_args=extra_args, dependencies=dependencies)
|
||||
if not res.compiled:
|
||||
@@ -813,6 +816,7 @@ class CLikeCompiler:
|
||||
#error "No definition for __builtin_{func} found in the prefix"
|
||||
#endif
|
||||
#endif
|
||||
+ return 0;
|
||||
}}'''
|
||||
return self.links(t.format(**fargs), env, extra_args=extra_args,
|
||||
dependencies=dependencies)
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f27b7a60f339ba66fe4b8f81f0d1072e090a08eabbd6aa287683b2c2b9dd2d82
|
||||
size 1451189
|
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl0kyY0ACgkQO/RpO/7r
|
||||
lCgakBAAsjSXsQrEi8Tv2CS0eQfOVHVCocOySg+OfhNupe8h0PxIGBx9VnXMzGTH
|
||||
tSX2ZE8OfRRrcmqj9NpPtpsMV7n9GapXf8bmrf+xdM3YQfwTd0mYWMXZ/lKQDnuj
|
||||
TgDflcUd5ON+bDJyZNADfyYCACF/hTvfNmLEEz1xt0gtEgi7om9oH4FNEFlaunSk
|
||||
xpJ8WXGTCFepPnLkte14XVdoMzuhbb+evKhuUUU38dQ2FeqDrIyXnqtc45ljbHBC
|
||||
oMwQhBsWyv+Zjh/H8am5k8ed2CfZMau1i8xxBFvD6cBqMRp8aAA/8S4LMG7DIyO4
|
||||
+EnIX6aqs9SztaNErTNt2tcnGYojEy2xSnDc9sP7w712rfAxe2BcUNIsX8qAoU8B
|
||||
WdiK+Gx1FLi1oLp2lhn/YWH1uOrd3WCGnhbLT2RIDrIka7W3pyvIEzC2UzIeJU14
|
||||
JVc/6v+Rz/mIGzNu0yp27bAb1ecPM1sfECcb/47OEwpakuwNTjlkxtyr2kyLAOH2
|
||||
G0C1gPgpebyzNu+GISMJcTBolxLICOCeFSSBo4Cx1INgjKNEGSKMn3t4bYiMlrpe
|
||||
LZbudp9nlcC8bj5PLNbE+6zE770db4TDQ+DOSOKFJdloIwxoXvvBGBfJFm5JI3Ax
|
||||
Y5CUoKQczQJ/a6cZ2tJS6AzD9BRMmazI9mARrZKb0F2/w6/whvM=
|
||||
=uBVN
|
||||
-----END PGP SIGNATURE-----
|
3
meson-0.51.2.tar.gz
Normal file
3
meson-0.51.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76
|
||||
size 1453251
|
16
meson-0.51.2.tar.gz.asc
Normal file
16
meson-0.51.2.tar.gz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl1kEFQACgkQO/RpO/7r
|
||||
lCj0uhAAghXcnktZEMFIaWnAcoRgd7t6s27s/hDej5b1X8PsujaeXwItvgLQli1I
|
||||
ZZaPkkwDFcaOz3RiXeoRjvJKN3lD3Lb0UoEBOslcBgWRzb8zG+2npXmGeaEjGMe+
|
||||
9X0i1Eq0ZogOVt3Dqm7+ZMSBA0RR4YRQ2nIsZhsWCZD6WoMV68y5ACnkAKfLe9ho
|
||||
Me1gZaDCMqAzINiCeyPO1dRqLxN7UgveXC49bv+i38ah4SpDoHNkr6ZW8fkDEaXP
|
||||
dmlnOKuQBL6BOcEvuTSelPjUIUZMOSBykFAS7YzmMoEOAAe4T212ca7e93WMA4Ez
|
||||
+V/zx9aMnpD2KUNcAzndPzMr4NFPnIBg+vQdOq3OYubupnMOxRRzhDbKzmPc9hVp
|
||||
gXlDFxCGWDWhn0/F48L+V1oSIFXc4QPLKUF3XMQ4yNskrmKAnhQmNM5YAxMbg7Wo
|
||||
5At1gQc5M8laWBJnJ/2cFDJ6CrYSAGUXQFgH2Uw14BqLsG2prGYPF2KDTq5J/99R
|
||||
W3QEXXjDYJvAhTlVLzJE3nMA3JzxDztg4pry+zeJJ7XZmfvSs5KVFyqiA76r63xO
|
||||
OCbmtb0ZKflqqy3dCWsCbc0fFIfgNGJN6H+jQ4J0VkdRuAyEqWUDCkc3wxxHTCJ1
|
||||
5p60NxwX3C4HDdbn8eM9nhSQriDHjwhlmo/Kl2uqlw0Q6UErGZw=
|
||||
=6j53
|
||||
-----END PGP SIGNATURE-----
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 27 11:08:21 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 0.51.2:
|
||||
+ gnome: Handle overriden g-ir-scanner.
|
||||
+ cmake: fix missing -lpthread (fixes #5821)
|
||||
+ Pass optimization flags to rustc properly. Closes: #5788.
|
||||
- Drop fix-missing-return-statements-that-are-seen-with-Wer.patch:
|
||||
Fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 16 14:11:28 UTC 2019 - Martin Liška <mliska@suse.cz>
|
||||
|
||||
|
@ -28,7 +28,7 @@
|
||||
%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
|
||||
%bcond_with setuptools
|
||||
Name: meson%{name_ext}
|
||||
Version: 0.51.1
|
||||
Version: 0.51.2
|
||||
Release: 0
|
||||
Summary: Python-based build system
|
||||
License: Apache-2.0
|
||||
@ -50,7 +50,6 @@ Patch4: meson-fix-gcc48.patch
|
||||
# PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal@suse.com -- build and install using distutils instead of full setuptools
|
||||
Patch5: meson-distutils.patch
|
||||
Patch6: gcc9-sanitizer.patch
|
||||
Patch7: fix-missing-return-statements-that-are-seen-with-Wer.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: python3-base
|
||||
@ -164,7 +163,6 @@ This package provides support for meson.build files in Vim.
|
||||
%patch5 -p1
|
||||
%endif
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
|
||||
# Remove static boost tests from "test cases/frameworks/1 boost/".
|
||||
sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build
|
||||
|
Loading…
Reference in New Issue
Block a user