Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package meson for openSUSE:Factory checked
in at 2022-03-16 20:20:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/meson (Old)
and /work/SRC/openSUSE:Factory/.meson.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meson"
Wed Mar 16 20:20:14 2022 rev:81 rq:961939 version:0.61.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/meson/meson.changes 2022-02-17
00:29:45.781441237 +0100
+++ /work/SRC/openSUSE:Factory/.meson.new.25692/meson.changes 2022-03-16
20:20:15.556961256 +0100
@@ -1,0 +2,7 @@
+Tue Mar 15 14:31:51 UTC 2022 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- update to 0.61.3:
+ * fixes for other platform
+ * test updates and developer visible fixes
+
+-------------------------------------------------------------------
Old:
----
meson-0.61.2.tar.gz
meson-0.61.2.tar.gz.asc
New:
----
meson-0.61.3.tar.gz
meson-0.61.3.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ meson.spec ++++++
--- /var/tmp/diff_new_pack.PE6HoB/_old 2022-03-16 20:20:16.204961723 +0100
+++ /var/tmp/diff_new_pack.PE6HoB/_new 2022-03-16 20:20:16.208961726 +0100
@@ -28,7 +28,7 @@
%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
%bcond_with setuptools
Name: meson%{name_ext}
-Version: 0.61.2
+Version: 0.61.3
Release: 0
Summary: Python-based build system
License: Apache-2.0
++++++ meson-0.61.2.tar.gz -> meson-0.61.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/PKG-INFO new/meson-0.61.3/PKG-INFO
--- old/meson-0.61.2/PKG-INFO 2022-02-14 20:24:02.893610000 +0100
+++ new/meson-0.61.3/PKG-INFO 2022-03-14 18:58:43.452145300 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: meson
-Version: 0.61.2
+Version: 0.61.3
Summary: A high performance build system
Home-page: https://mesonbuild.com
Author: Jussi Pakkanen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/man/meson.1 new/meson-0.61.3/man/meson.1
--- old/meson-0.61.2/man/meson.1 2022-02-14 20:03:13.000000000 +0100
+++ new/meson-0.61.3/man/meson.1 2022-03-14 18:54:43.000000000 +0100
@@ -1,4 +1,4 @@
-.TH MESON "1" "February 2022" "meson 0.61.2" "User Commands"
+.TH MESON "1" "March 2022" "meson 0.61.3" "User Commands"
.SH NAME
meson - a high productivity build system
.SH DESCRIPTION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/meson.egg-info/PKG-INFO
new/meson-0.61.3/meson.egg-info/PKG-INFO
--- old/meson-0.61.2/meson.egg-info/PKG-INFO 2022-02-14 20:23:55.000000000
+0100
+++ new/meson-0.61.3/meson.egg-info/PKG-INFO 2022-03-14 18:58:37.000000000
+0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: meson
-Version: 0.61.2
+Version: 0.61.3
Summary: A high performance build system
Home-page: https://mesonbuild.com
Author: Jussi Pakkanen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/meson.egg-info/SOURCES.txt
new/meson-0.61.3/meson.egg-info/SOURCES.txt
--- old/meson-0.61.2/meson.egg-info/SOURCES.txt 2022-02-14 20:23:55.000000000
+0100
+++ new/meson-0.61.3/meson.egg-info/SOURCES.txt 2022-03-14 18:58:37.000000000
+0100
@@ -2740,7 +2740,6 @@
test cases/linuxlike/12 subprojects in subprojects/subprojects/b/meson.build
test cases/linuxlike/12 subprojects in subprojects/subprojects/c/c.h
test cases/linuxlike/12 subprojects in subprojects/subprojects/c/meson.build
-test cases/linuxlike/13 cmake dependency/cmVers.sh
test cases/linuxlike/13 cmake dependency/meson.build
test cases/linuxlike/13 cmake dependency/prog-checkver.c
test cases/linuxlike/13 cmake dependency/prog.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/mesonbuild/backend/ninjabackend.py
new/meson-0.61.3/mesonbuild/backend/ninjabackend.py
--- old/meson-0.61.2/mesonbuild/backend/ninjabackend.py 2022-02-14
20:03:13.000000000 +0100
+++ new/meson-0.61.3/mesonbuild/backend/ninjabackend.py 2022-03-14
18:54:43.000000000 +0100
@@ -2792,7 +2792,7 @@
commands += linker.get_std_shared_lib_link_args()
# All shared libraries are PIC
commands += linker.get_pic_args()
- if not isinstance(target, build.SharedModule) or
target.backwards_compat_want_soname:
+ if not isinstance(target, build.SharedModule) or
target.force_soname:
# Add -Wl,-soname arguments on Linux, -install_name on OS X
commands += linker.get_soname_args(
self.environment, target.prefix, target.name,
target.suffix,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/mesonbuild/build.py
new/meson-0.61.3/mesonbuild/build.py
--- old/meson-0.61.2/mesonbuild/build.py 2022-01-17 11:50:45.000000000
+0100
+++ new/meson-0.61.3/mesonbuild/build.py 2022-03-14 18:54:43.000000000
+0100
@@ -1601,10 +1601,15 @@
Warn if shared modules are linked with target: (link_with) #2865
'''
for link_target in self.link_targets:
- if isinstance(link_target, SharedModule) and not
link_target.backwards_compat_want_soname:
+ if isinstance(link_target, SharedModule) and not
link_target.force_soname:
if self.environment.machines[self.for_machine].is_darwin():
raise MesonException(
f'target {self.name} links against shared module
{link_target.name}. This is not permitted on OSX')
+ elif self.environment.machines[self.for_machine].is_android()
and isinstance(self, SharedModule):
+ # Android requires shared modules that use symbols from
other shared modules to
+ # be linked before they can be dlopen()ed in the correct
order. Not doing so
+ # leads to a missing symbol error:
https://github.com/android/ndk/issues/201
+ link_target.force_soname = True
else:
mlog.deprecation(f'target {self.name} links against shared
module {link_target.name}, which is incorrect.'
'\n '
@@ -1613,7 +1618,7 @@
f'If shared_module() was used for
{link_target.name} because it has references to undefined symbols,'
'\n '
'use shared_libary() with `override_options:
[\'b_lundef=false\']` instead.')
- link_target.backwards_compat_want_soname = True
+ link_target.force_soname = True
class Generator(HoldableObject):
def __init__(self, exe: T.Union['Executable', programs.ExternalProgram],
@@ -2278,7 +2283,7 @@
self.typename = 'shared module'
# We need to set the soname in cases where build files link the module
# to build targets, see:
https://github.com/mesonbuild/meson/issues/9492
- self.backwards_compat_want_soname = False
+ self.force_soname = False
def get_default_install_dir(self, environment) -> T.Tuple[str, str]:
return environment.get_shared_module_dir(), '{moduledir_shared}'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/mesonbuild/compilers/d.py
new/meson-0.61.3/mesonbuild/compilers/d.py
--- old/meson-0.61.2/mesonbuild/compilers/d.py 2022-02-14 20:03:13.000000000
+0100
+++ new/meson-0.61.3/mesonbuild/compilers/d.py 2022-03-14 18:54:43.000000000
+0100
@@ -286,7 +286,7 @@
# see the comment in the "-L" section
link_expect_arg = False
link_flags_with_arg = [
- '-rpath', '-soname', '-compatibility_version', '-current_version',
+ '-rpath', '-rpath-link', '-soname', '-compatibility_version',
'-current_version',
]
for arg in args:
# Translate OS specific arguments first.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/mesonbuild/compilers/detect.py
new/meson-0.61.3/mesonbuild/compilers/detect.py
--- old/meson-0.61.2/mesonbuild/compilers/detect.py 2022-01-17
11:50:45.000000000 +0100
+++ new/meson-0.61.3/mesonbuild/compilers/detect.py 2022-03-14
18:54:43.000000000 +0100
@@ -1012,7 +1012,7 @@
else:
linker = type(cc.linker)(compiler, for_machine,
cc.LINKER_PREFIX,
always_args=always_args,
version=cc.linker.version,
- **extra_args) # type: ignore
+ **extra_args)
elif 'link' in override[0]:
linker = guess_win_linker(env,
override, cls, for_machine, use_linker_prefix=False)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/mesonbuild/coredata.py
new/meson-0.61.3/mesonbuild/coredata.py
--- old/meson-0.61.2/mesonbuild/coredata.py 2022-02-14 20:03:13.000000000
+0100
+++ new/meson-0.61.3/mesonbuild/coredata.py 2022-03-14 18:54:43.000000000
+0100
@@ -43,11 +43,14 @@
KeyedOptionDictType = T.Union[T.Dict['OptionKey', 'UserOption[T.Any]'],
OptionOverrideProxy]
CompilerCheckCacheKey = T.Tuple[T.Tuple[str, ...], str, FileOrString,
T.Tuple[str, ...], str]
+ # typeshed
+ StrOrBytesPath = T.Union[str, bytes, os.PathLike[str], os.PathLike[bytes]]
+
# Check major_versions_differ() if changing versioning scheme.
#
# Pip requires that RCs are named like this: '0.1.0.rc1'
# But the corresponding Git tag needs to be '0.1.0rc1'
-version = '0.61.2'
+version = '0.61.3'
backendlist = ['ninja', 'vs', 'vs2010', 'vs2012', 'vs2013', 'vs2015',
'vs2017', 'vs2019', 'vs2022', 'xcode']
@@ -897,6 +900,9 @@
# storing subproject options like "subproject:option=value"
super().__init__(delimiters=['='], interpolation=None)
+ def read(self, filenames: T.Union['StrOrBytesPath',
T.Iterable['StrOrBytesPath']], encoding: str ='utf-8') -> T.List[str]:
+ return super().read(filenames, encoding)
+
def optionxform(self, option: str) -> str:
# Don't call str.lower() on keys
return option
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/mesonbuild/dependencies/misc.py
new/meson-0.61.3/mesonbuild/dependencies/misc.py
--- old/meson-0.61.2/mesonbuild/dependencies/misc.py 2021-12-26
17:24:25.000000000 +0100
+++ new/meson-0.61.3/mesonbuild/dependencies/misc.py 2022-03-14
18:54:43.000000000 +0100
@@ -471,8 +471,9 @@
class IntlBuiltinDependency(BuiltinDependency):
def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str,
T.Any]):
super().__init__(name, env, kwargs)
+ code = '''#include <libintl.h>\n\nint main() {\n gettext("Hello
world");\n}'''
- if self.clib_compiler.has_function('ngettext', '', env)[0]:
+ if self.clib_compiler.links(code, env)[0]:
self.is_found = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/mesonbuild/dependencies/ui.py
new/meson-0.61.3/mesonbuild/dependencies/ui.py
--- old/meson-0.61.2/mesonbuild/dependencies/ui.py 2021-11-02
20:58:07.000000000 +0100
+++ new/meson-0.61.3/mesonbuild/dependencies/ui.py 2022-03-14
18:54:43.000000000 +0100
@@ -145,7 +145,7 @@
class WxDependency(ConfigToolDependency):
- tools = ['wx-config-3.0', 'wx-config', 'wx-config-gtk3']
+ tools = ['wx-config-3.0', 'wx-config-3.1', 'wx-config', 'wx-config-gtk3']
tool_name = 'wx-config'
def __init__(self, environment: 'Environment', kwargs: T.Dict[str, T.Any]):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/mesonbuild/mesonmain.py
new/meson-0.61.3/mesonbuild/mesonmain.py
--- old/meson-0.61.2/mesonbuild/mesonmain.py 2022-02-14 20:03:13.000000000
+0100
+++ new/meson-0.61.3/mesonbuild/mesonmain.py 2022-03-14 18:54:43.000000000
+0100
@@ -215,6 +215,11 @@
print('Please update your environment')
return 1
+ if sys.version_info >= (3, 10) and
os.environ.get('MESON_RUNNING_IN_PROJECT_TESTS'):
+ # workaround for https://bugs.python.org/issue34624
+ import warnings
+ warnings.filterwarnings('error', category=EncodingWarning,
module='mesonbuild')
+
# Meson gets confused if stdout can't output Unicode, if the
# locale isn't Unicode, just force stdout to accept it. This tries
# to emulate enough of PEP 540 to work elsewhere.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/mesonbuild/mtest.py
new/meson-0.61.3/mesonbuild/mtest.py
--- old/meson-0.61.2/mesonbuild/mtest.py 2021-12-26 17:24:25.000000000
+0100
+++ new/meson-0.61.3/mesonbuild/mtest.py 2022-03-14 18:54:43.000000000
+0100
@@ -665,9 +665,8 @@
if not harness.options.quiet or not result.res.is_ok():
self.flush()
- if harness.options.verbose and not result.is_parallel and
result.cmdline:
- if not result.needs_parsing:
- print(self.output_end)
+ if harness.options.verbose and not result.is_parallel and
result.cmdline and not result.needs_parsing:
+ print(self.output_end)
print(harness.format(result, mlog.colorize_console(),
max_left_width=self.max_left_width))
else:
print(harness.format(result, mlog.colorize_console(),
max_left_width=self.max_left_width),
@@ -1345,9 +1344,12 @@
self.console_mode = ConsoleUser.LOGGER
def _get_test_cmd(self) -> T.Optional[T.List[str]]:
- if self.test.fname[0].endswith('.jar'):
+ testentry = self.test.fname[0]
+ if self.options.no_rebuild and not os.path.isfile(testentry):
+ raise TestException(f'The test program {testentry!r} does not
exist. Cannot run tests before building them.')
+ if testentry.endswith('.jar'):
return ['java', '-jar'] + self.test.fname
- elif not self.test.is_cross_built and
run_with_mono(self.test.fname[0]):
+ elif not self.test.is_cross_built and run_with_mono(testentry):
return ['mono'] + self.test.fname
elif self.test.cmd_is_built and self.test.is_cross_built and
self.test.needs_exe_wrapper:
if self.test.exe_wrapper is None:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/mesonbuild/wrap/wrap.py
new/meson-0.61.3/mesonbuild/wrap/wrap.py
--- old/meson-0.61.2/mesonbuild/wrap/wrap.py 2022-01-17 11:50:45.000000000
+0100
+++ new/meson-0.61.3/mesonbuild/wrap/wrap.py 2022-03-14 18:54:43.000000000
+0100
@@ -118,7 +118,7 @@
def parse_wrap(self) -> None:
try:
config = configparser.ConfigParser(interpolation=None)
- config.read(self.filename)
+ config.read(self.filename, encoding='utf-8')
except configparser.Error as e:
raise WrapException(f'Failed to parse {self.basename}: {e!s}')
self.parse_wrap_section(config)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/run_project_tests.py
new/meson-0.61.3/run_project_tests.py
--- old/meson-0.61.2/run_project_tests.py 2022-01-17 11:50:45.000000000
+0100
+++ new/meson-0.61.3/run_project_tests.py 2022-03-14 18:54:43.000000000
+0100
@@ -282,7 +282,8 @@
failing_logs: T.List[str] = []
print_debug = 'MESON_PRINT_TEST_OUTPUT' in os.environ
under_ci = 'CI' in os.environ
-ci_jobname = os.environ.get('MESON_CI_JOBNAME', None)
+raw_ci_jobname = os.environ.get('MESON_CI_JOBNAME', None)
+ci_jobname = raw_ci_jobname if raw_ci_jobname != 'thirdparty' else None
do_debug = under_ci or print_debug
no_meson_log_msg = 'No meson-log.txt found.'
@@ -972,7 +973,7 @@
def skip_dont_care(t: TestDef) -> bool:
# Everything is optional when not running on CI
- if not under_ci:
+ if ci_jobname is None:
return True
# Non-frameworks test are allowed to determine their own skipping under CI
(currently)
@@ -1506,8 +1507,8 @@
mesonlib.windows_proof_rm(str(d))
if __name__ == '__main__':
- if under_ci and not ci_jobname:
- raise SystemExit('Running under CI but MESON_CI_JOBNAME is not set')
+ if under_ci and not raw_ci_jobname:
+ raise SystemExit('Running under CI but $MESON_CI_JOBNAME is not set
(set to "thirdparty" if you are running outside of the github org)')
setup_vsenv()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/run_tests.py
new/meson-0.61.3/run_tests.py
--- old/meson-0.61.2/run_tests.py 2022-01-17 11:50:38.000000000 +0100
+++ new/meson-0.61.3/run_tests.py 2022-03-14 18:54:43.000000000 +0100
@@ -46,13 +46,13 @@
NINJA_1_9_OR_NEWER = False
NINJA_CMD = None
-# If we're on CI, just assume we have ninja in PATH and it's new enough because
-# we provide that. This avoids having to detect ninja for every subprocess unit
-# test that we run.
-if 'CI' in os.environ:
- NINJA_1_9_OR_NEWER = True
- NINJA_CMD = ['ninja']
-else:
+# If we're on CI, detecting ninja for every subprocess unit test that we run
is slow
+# Optimize this by respecting $NINJA and skipping detection, then exporting it
on
+# first run.
+try:
+ NINJA_1_9_OR_NEWER = bool(int(os.environ['NINJA_1_9_OR_NEWER']))
+ NINJA_CMD = [os.environ['NINJA']]
+except (KeyError, ValueError):
# Look for 1.9 to see if https://github.com/ninja-build/ninja/issues/1219
# is fixed
NINJA_CMD = detect_ninja('1.9')
@@ -61,9 +61,21 @@
else:
mlog.warning('Found ninja <1.9, tests will run slower', once=True)
NINJA_CMD = detect_ninja()
-if NINJA_CMD is None:
+
+if NINJA_CMD is not None:
+ os.environ['NINJA_1_9_OR_NEWER'] = str(int(NINJA_1_9_OR_NEWER))
+ os.environ['NINJA'] = NINJA_CMD[0]
+else:
raise RuntimeError('Could not find Ninja v1.7 or newer')
+# Emulate running meson with -X utf8 by making sure all open() calls have a
+# sane encoding. This should be a python default, but PEP 540 considered it not
+# backwards compatible. Instead, much line noise in diffs to update this, and
in
+# python 3.10 we can also make it a warning when absent.
+os.environ['PYTHONWARNDEFAULTENCODING'] = '1'
+# work around https://bugs.python.org/issue34624
+os.environ['MESON_RUNNING_IN_PROJECT_TESTS'] = '1'
+
def guess_backend(backend_str: str, msbuild_exe: str) -> T.Tuple['Backend',
T.List[str]]:
# Auto-detect backend if unspecified
backend_flags = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' "old/meson-0.61.2/test cases/common/120 extract all
shared library/meson.build" "new/meson-0.61.3/test cases/common/120 extract all
shared library/meson.build"
--- "old/meson-0.61.2/test cases/common/120 extract all shared
library/meson.build" 2021-10-23 18:49:12.000000000 +0200
+++ "new/meson-0.61.3/test cases/common/120 extract all shared
library/meson.build" 2022-03-14 18:54:43.000000000 +0100
@@ -6,7 +6,8 @@
a = static_library('a', 'one.c', 'two.c')
b = static_library('b', 'three.c', 'four.c')
-c = shared_library('c',
+# libc.so cannot be used, it already exists as a reserved name
+c = shared_library('cee',
objects : [a.extract_all_objects(), b.extract_all_objects()],
vs_module_defs : 'func1234.def')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' "old/meson-0.61.2/test cases/common/155 subproject dir
name collision/custom_subproject_dir/C/meson.build" "new/meson-0.61.3/test
cases/common/155 subproject dir name
collision/custom_subproject_dir/C/meson.build"
--- "old/meson-0.61.2/test cases/common/155 subproject dir name
collision/custom_subproject_dir/C/meson.build" 2021-08-18 13:22:15.000000000
+0200
+++ "new/meson-0.61.3/test cases/common/155 subproject dir name
collision/custom_subproject_dir/C/meson.build" 2022-03-14 18:54:43.000000000
+0100
@@ -1,2 +1,3 @@
project('C', 'c')
-c = library('c', 'c.c')
+# libc.so cannot be used, it already exists as a reserved name
+c = library('cee', 'c.c')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' "old/meson-0.61.2/test cases/common/72 shared
subproject/subprojects/C/meson.build" "new/meson-0.61.3/test cases/common/72
shared subproject/subprojects/C/meson.build"
--- "old/meson-0.61.2/test cases/common/72 shared
subproject/subprojects/C/meson.build" 2021-08-18 13:22:15.000000000 +0200
+++ "new/meson-0.61.3/test cases/common/72 shared
subproject/subprojects/C/meson.build" 2022-03-14 18:54:43.000000000 +0100
@@ -1,2 +1,3 @@
project('C', 'c')
-c = library('c', 'c.c')
+# libc.so cannot be used, it already exists as a reserved name
+c = library('cee', 'c.c')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' "old/meson-0.61.2/test cases/common/73 shared subproject
2/subprojects/C/meson.build" "new/meson-0.61.3/test cases/common/73 shared
subproject 2/subprojects/C/meson.build"
--- "old/meson-0.61.2/test cases/common/73 shared subproject
2/subprojects/C/meson.build" 2021-08-18 13:22:15.000000000 +0200
+++ "new/meson-0.61.3/test cases/common/73 shared subproject
2/subprojects/C/meson.build" 2022-03-14 18:54:43.000000000 +0100
@@ -1,2 +1,3 @@
project('C', 'c')
-c = library('c', 'c.c')
+# libc.so cannot be used, it already exists as a reserved name
+c = library('cee', 'c.c')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' "old/meson-0.61.2/test cases/common/75 custom subproject
dir/custom_subproject_dir/C/meson.build" "new/meson-0.61.3/test cases/common/75
custom subproject dir/custom_subproject_dir/C/meson.build"
--- "old/meson-0.61.2/test cases/common/75 custom subproject
dir/custom_subproject_dir/C/meson.build" 2021-04-27 08:50:21.000000000 +0200
+++ "new/meson-0.61.3/test cases/common/75 custom subproject
dir/custom_subproject_dir/C/meson.build" 2022-03-14 18:54:43.000000000 +0100
@@ -1,2 +1,3 @@
project('C', 'c')
-c = shared_library('c', 'c.c')
+# libc.so cannot be used, it already exists as a reserved name
+c = shared_library('cee', 'c.c')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' "old/meson-0.61.2/test cases/linuxlike/13 cmake
dependency/cmVers.sh" "new/meson-0.61.3/test cases/linuxlike/13 cmake
dependency/cmVers.sh"
--- "old/meson-0.61.2/test cases/linuxlike/13 cmake dependency/cmVers.sh"
2021-04-01 23:13:00.000000000 +0200
+++ "new/meson-0.61.3/test cases/linuxlike/13 cmake dependency/cmVers.sh"
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-VERS=$(cmake --version | grep "cmake version")
-VERS=${VERS//cmake version/}
-
-echo -n $VERS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' "old/meson-0.61.2/test cases/linuxlike/13 cmake
dependency/meson.build" "new/meson-0.61.3/test cases/linuxlike/13 cmake
dependency/meson.build"
--- "old/meson-0.61.2/test cases/linuxlike/13 cmake dependency/meson.build"
2021-12-26 17:24:25.000000000 +0100
+++ "new/meson-0.61.3/test cases/linuxlike/13 cmake dependency/meson.build"
2022-03-14 18:54:43.000000000 +0100
@@ -6,9 +6,6 @@
error('MESON_SKIP_TEST cmake binary not available.')
endif
-# CMake version
-cm_vers = run_command(find_program('./cmVers.sh'), check:
true).stdout().strip()
-
# Zlib is probably on all dev machines.
dep = dependency('ZLIB', version : '>=1.2', method : 'cmake')
@@ -69,7 +66,7 @@
# Test some edge cases with spaces, etc. (but only for CMake >= 3.15)
-if cm_vers.version_compare('>=3.15')
+if find_program('cmake', required: false, version: '>=3.15').found()
testDep1 = dependency('ImportedTarget', required : true, method : 'cmake',
cmake_module_path : 'cmake', modules: 'mesonTestLibDefs')
testDep2 = dependency('ImportedTarget', required : true, method : 'cmake',
cmake_module_path : 'cmake', modules : ['MesonTest::TestLibDefs'])
testFlagSet1 = executable('testFlagSet1', ['testFlagSet.c'], dependencies:
[testDep1])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/meson-0.61.2/unittests/helpers.py
new/meson-0.61.3/unittests/helpers.py
--- old/meson-0.61.2/unittests/helpers.py 2022-02-14 20:03:13.000000000
+0100
+++ new/meson-0.61.3/unittests/helpers.py 2022-03-14 18:54:43.000000000
+0100
@@ -17,7 +17,7 @@
def is_ci():
- if 'MESON_CI_JOBNAME' in os.environ:
+ if os.environ.get('MESON_CI_JOBNAME') not in {None, 'thirdparty'}:
return True
return False
