diff --git a/meson-0.53.1.tar.gz b/meson-0.53.1.tar.gz deleted file mode 100644 index 6992423..0000000 --- a/meson-0.53.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04 -size 1552121 diff --git a/meson-0.53.1.tar.gz.asc b/meson-0.53.1.tar.gz.asc deleted file mode 100644 index a0dfa62..0000000 --- a/meson-0.53.1.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl4qJUYACgkQO/RpO/7r -lChjcQ//byfqVeXmHPingaXK+N9pTn9N0TFuLJ2wd3bN9eX1A5p2uPYedTI35re2 -09AiKTt85oIu5PJ2PDNDl62xA6Pn5H+ZVfEWofJFP4J11NHTF2G8G4RwUBFkfqUK -DGX8ulTskS+0u9w6fJ+Rqamd8BJWQMqvg3ziM6PIKucrbQHVRl0a5bcBRHa/Y7E1 -V4B725klZfGdhgGZUN+KHLpL0oKUrPCKwoinZJL24IM5TlpFbMVb40Igq5E8FFar -mc7hrU4ZxnSISAwrrDTJR4npIz1DbbIw7+ejcddWFA/SAeyjb31cuem0cmD1R451 -Bwm6ssYZP0qHcM2Sz6Zzg32g8R08U9tax0o34U1V4U6UaoMij9QPx8EFVNUPukjc -ADVfkUt1yvHB08UafGNd67hYXNoPgBsJ2k9xb4QP53OuD8LejM9cPCAAWCXpFJ+d -BoLBE6aB+zuberqEmOByvXmvW35hg7WnMIAVWRvyCxZroco3f260CXOQouijuUfe -FVjS/Lq+xNR4PjaW/D6Mp487YK1CI3LPBlLV7pEMtHWOTqgM2TNVLEGqpRr+hIKs -S/mGgc0t5Z9vuQ5R9jjz8hULCeQWISvoB3hd6+m5C2GBlIJ3aJqxcyntfCRk7H5R -Z/nL6hAIxc17NUEFfgd7wcdciLTA8dRvBXfhWN4sKlMpjd6UJYg= -=wW9R ------END PGP SIGNATURE----- diff --git a/meson-0.53.2.tar.gz b/meson-0.53.2.tar.gz new file mode 100644 index 0000000..16b0def --- /dev/null +++ b/meson-0.53.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e8f830f33184397c2eb0b651ec502adb63decb28978bdc84b3558d71284c21f +size 1557955 diff --git a/meson-0.53.2.tar.gz.asc b/meson-0.53.2.tar.gz.asc new file mode 100644 index 0000000..6683ecf --- /dev/null +++ b/meson-0.53.2.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl5VaMcACgkQO/RpO/7r +lCiTYhAAqo9mVbDnhSBUxanIIBzDqEtupjm+23blidD4xx00VbQSPCWi/rWsXcxV +l5WIDijBLEwQWOy1N6huro/l4F6sshnQmwFdCCUG/PRKrDSmTqagnKCVukgoh99e +rfrl6Z/TPr6vbDfRY/OzWGsf86lXy+vkDX/B9n0XVPr0S9N01N0sHBSYFGoaJusW +4fpKLo4YjLgZEQbzeZZWIbU8vrCxh97798CQw152UPmjVLDr92lMhzVlGBLRWlyN +d0Ih1BxsZEbLSRp8pOyQCwrqh/f37qcuu1x/y2BtuKkYXCJrQSH2repdSDjMg9zQ +Qv2rGFZblfuplZwESJHwM6NiqKD6N9W3Cg6DW8z71cf5T0xocvVGk4/zOysZIfJb +7IyDgVlow5qubR8T5dmBhJWFOIfpRoD0zermdAJCwee8GMoNbi8eCOp1vzEpX4fy +f7YQHexkoT3XZmCHuQ6yV+8xpSOkvSLAaNv4Gym40WocD5ECMnA+FKq/XmYWsIQb +RYzJBjhiO4UBWaBRtBQLV1Q0DmzHoAcenfU6tAxm8VrrFS01Ku8FwXpnmZgcqsPK +eZ4Kc+qhWK2P82Coys3NsZSnbXwRwQuUdVm0pXx3xJV/GqIkPcjWxn+QrG7sE0pj +pMX/xXKX6s1DwWdsENgokJDBSZ6V7gJGXwfTyedcHWyknZysC5Y= +=Wv1O +-----END PGP SIGNATURE----- diff --git a/meson-6614.patch b/meson-6614.patch deleted file mode 100644 index b9a5f04..0000000 --- a/meson-6614.patch +++ /dev/null @@ -1,140 +0,0 @@ -From c6684f3eee34888759171dd790f332cc57f00f60 Mon Sep 17 00:00:00 2001 -From: Daniel Mensinger -Date: Wed, 12 Feb 2020 19:23:25 +0100 -Subject: [PATCH] cmake: Fix crash when no C++ compiler is not installed (fixes - #6559) - ---- - mesonbuild/cmake/executor.py | 96 +++++++++++++++++++----------------- - 1 file changed, 50 insertions(+), 46 deletions(-) - -diff --git a/mesonbuild/cmake/executor.py b/mesonbuild/cmake/executor.py -index c3303ebd6c..7b9edf7b0c 100644 ---- a/mesonbuild/cmake/executor.py -+++ b/mesonbuild/cmake/executor.py -@@ -23,6 +23,7 @@ - import os - import shutil - import ctypes -+import textwrap - - from .. import mlog, mesonlib - from ..mesonlib import PerMachine, Popen_safe, version_compare, MachineChoice -@@ -264,9 +265,12 @@ def choose_compiler(lang: str) -> T.Tuple[str, str]: - if lang in compilers: - exe_list = compilers[lang].get_exelist() - else: -- comp_obj = self.environment.compiler_from_language(lang, MachineChoice.BUILD) -- if comp_obj is not None: -- exe_list = comp_obj.get_exelist() -+ try: -+ comp_obj = self.environment.compiler_from_language(lang, MachineChoice.BUILD) -+ if comp_obj is not None: -+ exe_list = comp_obj.get_exelist() -+ except Exception: -+ pass - - if len(exe_list) == 1: - return make_abs(exe_list[0], lang), '' -@@ -278,10 +282,7 @@ def choose_compiler(lang: str) -> T.Tuple[str, str]: - - c_comp, c_launcher = choose_compiler('c') - cxx_comp, cxx_launcher = choose_compiler('cpp') -- try: -- fortran_comp, fortran_launcher = choose_compiler('fortran') -- except Exception: -- fortran_comp = fortran_launcher = '' -+ fortran_comp, fortran_launcher = choose_compiler('fortran') - - # on Windows, choose_compiler returns path with \ as separator - replace by / before writing to CMAKE file - c_comp = c_comp.replace('\\', '/') -@@ -302,47 +303,50 @@ def choose_compiler(lang: str) -> T.Tuple[str, str]: - cxx_comp_file = comp_dir / 'CMakeCXXCompiler.cmake' - fortran_comp_file = comp_dir / 'CMakeFortranCompiler.cmake' - -- if not c_comp_file.is_file(): -- c_comp_file.write_text('''# Fake CMake file to skip the boring and slow stuff --set(CMAKE_C_COMPILER "{}") # Should be a valid compiler for try_compile, etc. --set(CMAKE_C_COMPILER_LAUNCHER "{}") # The compiler launcher (if presentt) --set(CMAKE_C_COMPILER_ID "GNU") # Pretend we have found GCC --set(CMAKE_COMPILER_IS_GNUCC 1) --set(CMAKE_C_COMPILER_LOADED 1) --set(CMAKE_C_COMPILER_WORKS TRUE) --set(CMAKE_C_ABI_COMPILED TRUE) --set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m) --set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) --set(CMAKE_SIZEOF_VOID_P "{}") --'''.format(c_comp, c_launcher, ctypes.sizeof(ctypes.c_voidp))) -- -- if not cxx_comp_file.is_file(): -- cxx_comp_file.write_text('''# Fake CMake file to skip the boring and slow stuff --set(CMAKE_CXX_COMPILER "{}") # Should be a valid compiler for try_compile, etc. --set(CMAKE_CXX_COMPILER_LAUNCHER "{}") # The compiler launcher (if presentt) --set(CMAKE_CXX_COMPILER_ID "GNU") # Pretend we have found GCC --set(CMAKE_COMPILER_IS_GNUCXX 1) --set(CMAKE_CXX_COMPILER_LOADED 1) --set(CMAKE_CXX_COMPILER_WORKS TRUE) --set(CMAKE_CXX_ABI_COMPILED TRUE) --set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC) --set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;mm;CPP) --set(CMAKE_SIZEOF_VOID_P "{}") --'''.format(cxx_comp, cxx_launcher, ctypes.sizeof(ctypes.c_voidp))) -+ if c_comp and not c_comp_file.is_file(): -+ c_comp_file.write_text(textwrap.dedent('''\ -+ # Fake CMake file to skip the boring and slow stuff -+ set(CMAKE_C_COMPILER "{}") # Should be a valid compiler for try_compile, etc. -+ set(CMAKE_C_COMPILER_LAUNCHER "{}") # The compiler launcher (if presentt) -+ set(CMAKE_C_COMPILER_ID "GNU") # Pretend we have found GCC -+ set(CMAKE_COMPILER_IS_GNUCC 1) -+ set(CMAKE_C_COMPILER_LOADED 1) -+ set(CMAKE_C_COMPILER_WORKS TRUE) -+ set(CMAKE_C_ABI_COMPILED TRUE) -+ set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m) -+ set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) -+ set(CMAKE_SIZEOF_VOID_P "{}") -+ '''.format(c_comp, c_launcher, ctypes.sizeof(ctypes.c_voidp)))) -+ -+ if cxx_comp and not cxx_comp_file.is_file(): -+ cxx_comp_file.write_text(textwrap.dedent('''\ -+ # Fake CMake file to skip the boring and slow stuff -+ set(CMAKE_CXX_COMPILER "{}") # Should be a valid compiler for try_compile, etc. -+ set(CMAKE_CXX_COMPILER_LAUNCHER "{}") # The compiler launcher (if presentt) -+ set(CMAKE_CXX_COMPILER_ID "GNU") # Pretend we have found GCC -+ set(CMAKE_COMPILER_IS_GNUCXX 1) -+ set(CMAKE_CXX_COMPILER_LOADED 1) -+ set(CMAKE_CXX_COMPILER_WORKS TRUE) -+ set(CMAKE_CXX_ABI_COMPILED TRUE) -+ set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC) -+ set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;mm;CPP) -+ set(CMAKE_SIZEOF_VOID_P "{}") -+ '''.format(cxx_comp, cxx_launcher, ctypes.sizeof(ctypes.c_voidp)))) - - if fortran_comp and not fortran_comp_file.is_file(): -- fortran_comp_file.write_text('''# Fake CMake file to skip the boring and slow stuff --set(CMAKE_Fortran_COMPILER "{}") # Should be a valid compiler for try_compile, etc. --set(CMAKE_Fortran_COMPILER_LAUNCHER "{}") # The compiler launcher (if presentt) --set(CMAKE_Fortran_COMPILER_ID "GNU") # Pretend we have found GCC --set(CMAKE_COMPILER_IS_GNUG77 1) --set(CMAKE_Fortran_COMPILER_LOADED 1) --set(CMAKE_Fortran_COMPILER_WORKS TRUE) --set(CMAKE_Fortran_ABI_COMPILED TRUE) --set(CMAKE_Fortran_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) --set(CMAKE_Fortran_SOURCE_FILE_EXTENSIONS f;F;fpp;FPP;f77;F77;f90;F90;for;For;FOR;f95;F95) --set(CMAKE_SIZEOF_VOID_P "{}") --'''.format(fortran_comp, fortran_launcher, ctypes.sizeof(ctypes.c_voidp))) -+ fortran_comp_file.write_text(textwrap.dedent('''\ -+ # Fake CMake file to skip the boring and slow stuff -+ set(CMAKE_Fortran_COMPILER "{}") # Should be a valid compiler for try_compile, etc. -+ set(CMAKE_Fortran_COMPILER_LAUNCHER "{}") # The compiler launcher (if presentt) -+ set(CMAKE_Fortran_COMPILER_ID "GNU") # Pretend we have found GCC -+ set(CMAKE_COMPILER_IS_GNUG77 1) -+ set(CMAKE_Fortran_COMPILER_LOADED 1) -+ set(CMAKE_Fortran_COMPILER_WORKS TRUE) -+ set(CMAKE_Fortran_ABI_COMPILED TRUE) -+ set(CMAKE_Fortran_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) -+ set(CMAKE_Fortran_SOURCE_FILE_EXTENSIONS f;F;fpp;FPP;f77;F77;f90;F90;for;For;FOR;f95;F95) -+ set(CMAKE_SIZEOF_VOID_P "{}") -+ '''.format(fortran_comp, fortran_launcher, ctypes.sizeof(ctypes.c_voidp)))) - - return self.call(args, build_dir, env) - diff --git a/meson.changes b/meson.changes index 46a9334..b54b869 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Feb 27 14:58:17 UTC 2020 - Dominique Leuenberger + +- Update to version 0.53.2: + + Various cmake related issues fixed. + + modules/python: Do not error out if positional args are passed. +- Drop meson-6614.patch: fixed upstream. + ------------------------------------------------------------------- Tue Feb 18 14:07:46 UTC 2020 - Ondřej Súkup diff --git a/meson.spec b/meson.spec index 12a5589..ede1588 100644 --- a/meson.spec +++ b/meson.spec @@ -28,7 +28,7 @@ %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} %bcond_with setuptools Name: meson%{name_ext} -Version: 0.53.1 +Version: 0.53.2 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -51,8 +51,6 @@ Patch4: meson-fix-gcc48.patch Patch5: meson-distutils.patch # PATCH-FIX-UPSTREAM meson-testsuite-boost.patch dimstar@opensuse.org -- https://github.com/mesonbuild/meson/issues/4788 Patch6: meson-testsuite-boost.patch -# PATCH-FIX-UPSTREAM meson-6614.patch dimstar@opensuse.org -- cmake: Fix crash when no C++ compiler is not installed -Patch7: meson-6614.patch # PATCH-FIX-UPSTREAM 6642.patch mimi.vx@gmail.com -- Fix skip python2 unittests Patch8: 6642.patch # PATCH-FIX-OPENSUSE meson-testsuite-boost2.patch mimi.vx@gmail.com -- disable libboost_python tests @@ -186,7 +184,6 @@ This package provides support for meson.build files in Vim. (cd "test cases/frameworks/1 boost" %patch6 -p0 ) -%patch7 -p1 %patch8 -p1 %if 0%{?suse_version} >= 1550 (cd "test cases/frameworks/1 boost"