Accepting request 716280 from devel:tools:building
OBS-URL: https://build.opensuse.org/request/show/716280 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=45
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
c242642408
48
fix-missing-return-statements-that-are-seen-with-Wer.patch
Normal file
48
fix-missing-return-statements-that-are-seen-with-Wer.patch
Normal file
@ -0,0 +1,48 @@
|
||||
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:2f75fdf6d586d3595c03a07afcd0eaae11f68dd33fea5906a434d22a409ed63f
|
||||
size 1449724
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl0GpbwACgkQO/RpO/7r
|
||||
lCia4g//UXJgKZdfckL9Agi6iAXt59fruiRbGlBVkvgqo+MAwS9Zpurh+PYrUL2P
|
||||
YGrRGMSnvVO4g2/+eO4lUL+PPkCYulAFp1KKwKnG1jldOoYNgHCFlsBZUi6Tjj2R
|
||||
HRSdDgbhFhxhmDbM0KH7eB5Vx/waQNvHirYbh3YVjC3yeznVdNo8T8xsCYpHkkUL
|
||||
pzEMtu0n+ICK343sto0wPgU1FQrBKm16gTVoSzUanKdul3oW209U3hPE8dQkRoZ0
|
||||
FtvGMlyCMvIRoMKOWh7vp7dHWPx+HW5AYCWcsFhQpzOEff4AzjmmWR/A6EWQaSXy
|
||||
YwQGcBzpo/Z31KuUW3IrAgERXRivW3LWL30yDmshciSUfpOQFaN1NjRswcHSpgD0
|
||||
BaLSpSDktshVCYKR2SvB+ccSwWfoq+qlRkZTx7yfR781o71GQLZuroRvaZxd1SBw
|
||||
3LUh2FxIV0up/pHplwYYpLtH8UDIKgRZ09z5AB0XNLKKeAKdNuALnASnMD87TlP/
|
||||
CendvfRyWG4+GN8t3gHj8FA/zTdAfAKXtbK9DiJrFjq5ECpXlBpHZHB5zEaKr762
|
||||
a12olVPDVXXfrMwMSww/5pxf+7y/SXhUKxzox9t17+ppQX3Hpb9PbX7D530L/SV+
|
||||
N7Z8qTmv9yfMTRe+lyK3gBxYiLGpcs1V7ET0FZzyk+FP4JvPWnU=
|
||||
=6vh8
|
||||
-----END PGP SIGNATURE-----
|
||||
3
meson-0.51.1.tar.gz
Normal file
3
meson-0.51.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f27b7a60f339ba66fe4b8f81f0d1072e090a08eabbd6aa287683b2c2b9dd2d82
|
||||
size 1451189
|
||||
16
meson-0.51.1.tar.gz.asc
Normal file
16
meson-0.51.1.tar.gz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----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-----
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 16 14:11:28 UTC 2019 - Martin Liška <mliska@suse.cz>
|
||||
|
||||
- Add fix-missing-return-statements-that-are-seen-with-Wer.patch which
|
||||
is an upstream version of: https://github.com/mesonbuild/meson/pull/5654
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 10 09:55:26 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 0.51.1:
|
||||
+ Increase logging for Rust CI failures.
|
||||
+ tests/llvm: Test both cmake and llvm-config methods.
|
||||
+ Improve error message when Python is not usable.
|
||||
+ gnome.py: correctly pick the compiler for gtk-doc builds.
|
||||
+ Switch to using Pyinstaller.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 26 10:51:31 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
|
||||
%bcond_with setuptools
|
||||
Name: meson%{name_ext}
|
||||
Version: 0.51.0
|
||||
Version: 0.51.1
|
||||
Release: 0
|
||||
Summary: Python-based build system
|
||||
License: Apache-2.0
|
||||
@ -50,6 +50,7 @@ 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
|
||||
@ -163,6 +164,7 @@ 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