From 147e47a322ce6e08040e1158c8b21ca695ee6ffd29c6ae682a27d82f51a22386 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 31 Mar 2020 13:52:04 +0000 Subject: [PATCH] Accepting request 790166 from home:dimstar:Factory - Update to version 0.54.0: OBS-URL: https://build.opensuse.org/request/show/790166 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=163 --- 6642.patch | 23 ------------- meson-0.53.2.tar.gz | 3 -- meson-0.53.2.tar.gz.asc | 16 --------- meson-0.54.0.tar.gz | 3 ++ meson-0.54.0.tar.gz.asc | 16 +++++++++ meson-test-installed-bin.patch | 12 +++---- meson-testsuite-boost.patch | 35 -------------------- meson-testsuite-boost2.patch | 59 ---------------------------------- meson.changes | 24 ++++++++++++++ meson.spec | 26 ++------------- 10 files changed, 52 insertions(+), 165 deletions(-) delete mode 100644 6642.patch delete mode 100644 meson-0.53.2.tar.gz delete mode 100644 meson-0.53.2.tar.gz.asc create mode 100644 meson-0.54.0.tar.gz create mode 100644 meson-0.54.0.tar.gz.asc delete mode 100644 meson-testsuite-boost.patch delete mode 100644 meson-testsuite-boost2.patch diff --git a/6642.patch b/6642.patch deleted file mode 100644 index defcb3c..0000000 --- a/6642.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 2d9d7857b07002668600e2d076dc89685ea8da40 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= - -Date: Tue, 18 Feb 2020 09:49:45 +0100 -Subject: [PATCH] Skip Py2 tests correctly also on other systems than Debian - ---- - run_unittests.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: meson-0.53.1/run_unittests.py -=================================================================== ---- meson-0.53.1.orig/run_unittests.py -+++ meson-0.53.1/run_unittests.py -@@ -6659,7 +6659,7 @@ class NativeFileTests(BasePlatformTests) - # python module breaks. This is fine on other OSes because they - # don't need the extra indirection. - raise unittest.SkipTest('bat indirection breaks internal sanity checks.') -- if os.path.exists('/etc/debian_version'): -+ if os.path.exists('/etc/os-release') or os.path.exists('/etc/debian_version'): - rc = subprocess.call(['pkg-config', '--cflags', 'python2'], - stdout=subprocess.DEVNULL, - stderr=subprocess.DEVNULL) diff --git a/meson-0.53.2.tar.gz b/meson-0.53.2.tar.gz deleted file mode 100644 index 16b0def..0000000 --- a/meson-0.53.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 6683ecf..0000000 --- a/meson-0.53.2.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------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-0.54.0.tar.gz b/meson-0.54.0.tar.gz new file mode 100644 index 0000000..1fbc6d6 --- /dev/null +++ b/meson-0.54.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dde5726d778112acbd4a67bb3633ab2ee75d33d1e879a6283a7b4a44c3363c27 +size 1683491 diff --git a/meson-0.54.0.tar.gz.asc b/meson-0.54.0.tar.gz.asc new file mode 100644 index 0000000..e724000 --- /dev/null +++ b/meson-0.54.0.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAl6A29oACgkQO/RpO/7r +lChTNQ/9FLYT586gwNVUBnjDRJItG3TNOet0zRke3yZ9bd0XndEjY1K+GxR7fBfZ +GA322egBUb/eFgPC2pJdy7cZu79iqFc3pOcWZ0US8Erii0ztnneuQUC/33ro2nxw +k3BvwIQT+epqbnplGA5khdMKXB1bYy+TSofL8B9Xz8zZJF1uruP4SyIzzOLgxUbO +8OZPqbNsSTX0yiL4ITjtaCBe04i/06XTOWf9iaFYNJjkDR+mAbxXGRY9emWtdYeM +ef0BuTaJaqUAKSIF6gk3I3h+g4dpRJ2/WWpte9N02RxJIorKx+XI/r99Z5i8cmOK +voSjfWei+CmdcCW2pLYcL9AAfqAlTKrd/LDJOqwMxnhCiORi1OnA2IbP0LHk+hSu +akxnNzqdq+j3FdBSnaudirbYtsOF2NNK1YgZD63K4ztngQpv4ePjONgWiT1Thl6u +Gv9CAe2M2kIfEPZWCebyknKrhlxgF+MkAhde+5dPqaUaoQQclmBFEnuZzTOCNmyr +LTI42p/HgI14aTfcVpB+O97DaYeJ3FjGrwv7EaDT7q1A7t1pIl+YP/thPRIGGjJl +8j+rq1+aeTfMNQU1UapNrNalNwJU324cDECmuWEOd24kRYsqzzmLJDOBlu5rXsTl +9PXmRIKA9h6WkfP0Uy30neBFjlp6KvivL+rxLgRyUjeymbbmA4E= +=OM4c +-----END PGP SIGNATURE----- diff --git a/meson-test-installed-bin.patch b/meson-test-installed-bin.patch index 6415460..ebffedd 100644 --- a/meson-test-installed-bin.patch +++ b/meson-test-installed-bin.patch @@ -1,8 +1,8 @@ -Index: meson-0.53.0/run_tests.py +Index: meson-0.54.0/run_tests.py =================================================================== ---- meson-0.53.0.orig/run_tests.py -+++ meson-0.53.0/run_tests.py -@@ -134,18 +134,10 @@ def get_meson_script(): +--- meson-0.54.0.orig/run_tests.py ++++ meson-0.54.0/run_tests.py +@@ -152,18 +152,10 @@ def get_meson_script(): Also used by run_unittests.py to determine what meson to run when not running in-process (which is the default). ''' @@ -23,7 +23,7 @@ Index: meson-0.53.0/run_tests.py def get_backend_args_for_dir(backend, builddir): ''' -@@ -363,12 +355,12 @@ def main(): +@@ -366,12 +358,12 @@ def main(): else: env['PYTHONPATH'] = temp_dir if not cross: @@ -41,4 +41,4 @@ Index: meson-0.53.0/run_tests.py + # return returncode if no_unittests: print('Skipping all unit tests.') - returncode = 0 + print(flush=True) diff --git a/meson-testsuite-boost.patch b/meson-testsuite-boost.patch deleted file mode 100644 index 2c13ac4..0000000 --- a/meson-testsuite-boost.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build -index eec8728e..c02223a0 100644 ---- meson.build -+++ meson.build -@@ -35,28 +35,14 @@ python3dep = python3.dependency(required: host_machine.system() == 'linux', embe - - # compile python 2/3 modules only if we found a corresponding python version - if(python2dep.found() and host_machine.system() == 'linux') -- if(dep.version().version_compare('>=1.67')) -- # if we have a new version of boost, we need to construct the module name based -- # on the installed version of python (and hope that they match the version boost -- # was compiled against) -- py2version_string = ''.join(python2dep.version().split('.')) -- bpython2dep = dependency('boost', modules : ['python' + py2version_string], required: false, disabler: true) -- else -- # if we have an older version of boost, we need to use the old module names -- bpython2dep = dependency('boost', modules : ['python'], required: false, disabler: true) -- endif -+ bpython2dep = dependency('boost', modules : ['python'], required: false, disabler: true) - else - python2dep = disabler() - bpython2dep = disabler() - endif - - if(python3dep.found() and host_machine.system() == 'linux') -- if(dep.version().version_compare('>=1.67')) -- py3version_string = ''.join(python3dep.version().split('.')) -- bpython3dep = dependency('boost', modules : ['python' + py3version_string], required: false, disabler: true) -- else -- bpython3dep = dependency('boost', modules : ['python3'], required: false, disabler: true) -- endif -+ bpython3dep = dependency('boost', modules : ['python3'], required: false, disabler: true) - else - python3dep = disabler() - bpython3dep = disabler() diff --git a/meson-testsuite-boost2.patch b/meson-testsuite-boost2.patch deleted file mode 100644 index 966ed8c..0000000 --- a/meson-testsuite-boost2.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: meson-0.53.1/test cases/frameworks/1 boost/meson.build -=================================================================== ---- meson.build -+++ meson.build -@@ -22,24 +22,14 @@ endif - # Use one without a library dependency and one with it. - - linkdep = dependency('boost', modules : ['thread', 'system', 'test']) --staticdep = dependency('boost', modules : ['thread', 'system'], static : true) - testdep = dependency('boost', modules : ['unit_test_framework']) - nomoddep = dependency('boost') - extralibdep = dependency('boost', modules : ['thread', 'system', 'log_setup', 'log']) - - pymod = import('python') --python2 = pymod.find_installation('python2', required: host_machine.system() == 'linux', disabler: true) - python3 = pymod.find_installation('python3', required: host_machine.system() == 'linux', disabler: true) --python2dep = python2.dependency(required: host_machine.system() == 'linux', embed: true, disabler: true) - python3dep = python3.dependency(required: host_machine.system() == 'linux', embed: true, disabler: true) - --# compile python 2/3 modules only if we found a corresponding python version --if(python2dep.found() and host_machine.system() == 'linux') -- bpython2dep = dependency('boost', modules : ['python'], required: false, disabler: true) --else -- python2dep = disabler() -- bpython2dep = disabler() --endif - - if(python3dep.found() and host_machine.system() == 'linux') - bpython3dep = dependency('boost', modules : ['python3'], required: false, disabler: true) -@@ -49,24 +39,19 @@ else - endif - - linkexe = executable('linkedexe', 'linkexe.cc', dependencies : linkdep) --staticexe = executable('staticlinkedexe', 'linkexe.cc', dependencies : staticdep) - unitexe = executable('utf', 'unit_test.cpp', dependencies: testdep) - nomodexe = executable('nomod', 'nomod.cpp', dependencies : nomoddep) - extralibexe = executable('extralibexe', 'extralib.cpp', dependencies : extralibdep) - - # python modules are shared libraries --python2module = shared_library('python2_module', ['python_module.cpp'], dependencies: [python2dep, bpython2dep], name_prefix: '', cpp_args: ['-DMOD_NAME=python2_module']) - python3module = shared_library('python3_module', ['python_module.cpp'], dependencies: [python3dep, bpython3dep], name_prefix: '', cpp_args: ['-DMOD_NAME=python3_module']) - - test('Boost linktest', linkexe) --test('Boost statictest', staticexe) - test('Boost UTF test', unitexe) - test('Boost nomod', nomodexe) - test('Boost extralib test', extralibexe) - - # explicitly use the correct python interpreter so that we don't have to provide two different python scripts that have different shebang lines --python2interpreter = find_program(python2.path(), required: false, disabler: true) --test('Boost Python2', python2interpreter, args: ['./test_python_module.py', meson.current_build_dir()], workdir: meson.current_source_dir(), depends: python2module) - python3interpreter = find_program(python3.path(), required: false, disabler: true) - test('Boost Python3', python3interpreter, args: ['./test_python_module.py', meson.current_build_dir()], workdir: meson.current_source_dir(), depends: python3module) - -@@ -74,3 +59,4 @@ subdir('partial_dep') - - # check we can apply a version constraint - dependency('boost', version: '>=@0@'.format(dep.version())) -+ diff --git a/meson.changes b/meson.changes index b54b869..4e2b792 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Mar 30 11:18:38 UTC 2020 - Dominique Leuenberger + +- Update to version 0.54.0: + + Emscripten (emcc) now supports threads. + + Introduce dataonly for the pkgconfig module. + + Consistently report file locations relative to cwd. + + Native (build machine) compilers not always required. + + Add a system type dependency for zlib. + + New option --quiet to meson install. + + Property support emscripten's wasm-ld. + + Support for overiding the linker with ldc and gdc. + + Per subproject default_library and werror options. + + Ninja version requirement bumped to 1.7. + + Added -C argument to meson init command. + + CMake find_package COMPONENTS support. + + Added Microchip XC16 C compiler support. +- Rebase meson-test-installed-bin.patch. +- Drop meson-testsuite-boost.patch: fixed (and enhanced) upstream. +- Drop meson-testsuite-boost2.patch: boost test suite globally + disabled for now. +- Drop 6642.patch: Fixed in an alternative way. +- Remove hacks to drop static llvm and boost tests: fixed upstream. + ------------------------------------------------------------------- Thu Feb 27 14:58:17 UTC 2020 - Dominique Leuenberger diff --git a/meson.spec b/meson.spec index ede1588..1b7ae3b 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.2 +Version: 0.54.0 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -49,12 +49,6 @@ Patch3: meson-suse-fix-llvm-3.8.patch 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 -# 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 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 -Patch9: meson-testsuite-boost2.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-base @@ -64,7 +58,7 @@ BuildRequires: python3-setuptools Requires: python3-setuptools %endif %if !%{with test} -Requires: ninja +Requires: ninja >= 1.7 Requires: python3-base # meson-gui was last used in openSUSE Leap 42.1. Provides: meson-gui = %{version} @@ -181,24 +175,10 @@ This package provides support for meson.build files in Vim. %if !%{with setuptools} %patch5 -p1 %endif -(cd "test cases/frameworks/1 boost" -%patch6 -p0 -) -%patch8 -p1 -%if 0%{?suse_version} >= 1550 -(cd "test cases/frameworks/1 boost" -%patch9 -p0 -) -%endif - -# Remove static boost tests from "test cases/frameworks/1 boost/". -sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build - -# Disable test of llvm-static libs: openSUSE does not package/ship them -sed -i "s/foreach static : \[true, false\]/foreach static : \[false\]/" test\ cases/frameworks/15\ llvm/meson.build # We do not have gmock available at this moment - can't run the test suite for it rm -r "test cases/frameworks/3 gmock" \ + "test cases/frameworks/1 boost" \ "test cases/objc/2 nsstring" # AddressSanitizer fails here because of ulimit.