Hello community, here is the log from the commit of package meson for openSUSE:Factory checked in at 2020-05-16 22:23:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meson (Old) and /work/SRC/openSUSE:Factory/.meson.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meson" Sat May 16 22:23:00 2020 rev:57 rq:805585 version:0.54.1 Changes: -------- --- /work/SRC/openSUSE:Factory/meson/meson.changes 2020-04-29 20:43:41.219846733 +0200 +++ /work/SRC/openSUSE:Factory/.meson.new.2738/meson.changes 2020-05-16 22:23:04.488871752 +0200 @@ -1,0 +2,11 @@ +Thu May 14 07:32:14 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Add meson-gcc10.patch: Fix test suite when using gcc 10. + +------------------------------------------------------------------- +Wed May 13 16:58:09 UTC 2020 - Michael Gorse <[email protected]> + +- Remove is_opensuse conditional and enable mono tests on SLE + (jsc#SLE-11721). + +------------------------------------------------------------------- New: ---- meson-gcc10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meson.spec ++++++ --- /var/tmp/diff_new_pack.KIJqiZ/_old 2020-05-16 22:23:05.128873066 +0200 +++ /var/tmp/diff_new_pack.KIJqiZ/_new 2020-05-16 22:23:05.128873066 +0200 @@ -49,6 +49,8 @@ Patch4: meson-fix-gcc48.patch # PATCH-FEATURE-OPENSUSE meson-distutils.patch [email protected] -- build and install using distutils instead of full setuptools Patch5: meson-distutils.patch +# PATCH-FIX-UPSTREAM [email protected] -- Fix test suite with GCC 10 +Patch6: meson-gcc10.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-base @@ -125,15 +127,11 @@ BuildRequires: wxWidgets-any-devel # csharp is not on s390 machines %ifnarch s390x -%if 0%{?is_opensuse} BuildRequires: mono(csharp) %endif -%endif %else BuildRequires: boost-devel -%if 0%{?is_opensuse} BuildRequires: mono-core -%endif BuildRequires: wxWidgets-devel %endif %endif @@ -175,6 +173,7 @@ %if !%{with setuptools} %patch5 -p1 %endif +%patch6 -p1 # We do not have gmock available at this moment - can't run the test suite for it rm -r "test cases/frameworks/3 gmock" \ ++++++ meson-gcc10.patch ++++++ >From 92102a911d3af9c69d33a386cc32f150bc14ba18 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan <[email protected]> Date: Thu, 14 May 2020 09:41:12 +0530 Subject: [PATCH] gfortran: Fix has_header implementation with GCC 10 __has_include is not accepted as a pre-processor directive in Fortran code since GCC 10. Closes https://github.com/mesonbuild/meson/issues/7017 --- mesonbuild/compilers/fortran.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) Index: meson-0.54.1/mesonbuild/compilers/fortran.py =================================================================== --- meson-0.54.1.orig/mesonbuild/compilers/fortran.py +++ meson-0.54.1/mesonbuild/compilers/fortran.py @@ -208,6 +208,18 @@ class GnuFortranCompiler(GnuCompiler, Fo def language_stdlib_only_link_flags(self): return ['-lgfortran', '-lm'] + def has_header(self, hname, prefix, env, *, extra_args=None, dependencies=None, disable_cache=False): + ''' + Derived from mixins/clike.py:has_header, but without C-style usage of + __has_include which breaks with GCC-Fortran 10: + https://github.com/mesonbuild/meson/issues/7017 + ''' + fargs = {'prefix': prefix, 'header': hname} + code = '{prefix}\n#include <{header}>' + return self.compiles(code.format(**fargs), env, extra_args=extra_args, + dependencies=dependencies, mode='preprocess', disable_cache=disable_cache) + + class ElbrusFortranCompiler(GnuFortranCompiler, ElbrusCompiler): def __init__(self, exelist, version, for_machine: MachineChoice, is_cross, info: 'MachineInfo', exe_wrapper=None,
