SHA256
3
0
forked from pool/meson
meson/meson-test-installed-bin.patch
Alexei Sorokin 0f8b9d9cc9 Accepting request 535269 from home:badshah400:branches:devel:tools:building
- Update to version 0.43.0:
  + Generator learned capture: Generators can now be configured to
    capture the standard output.
  + Can index CustomTarget objects: The CustomTarget object can
    now be indexed like an array. The resulting object can be used
    as a source file for other Targets, this will create a
    dependency on the original CustomTarget, but will only insert
    the generated file corresponding to the index value of the
    CustomTarget's output keyword.
  + The cross file can now be used for overriding the result of
    find_program. Then issuing the command find_program('objdump')
    will return the version specified in the cross file.
  + Easier handling of supported compiler arguments.
  + Better support for shared libraries in non-system paths: This
    release adds feature parity to shared libraries that are
    either in non-standard system paths or shipped as part of your
    project. On systems that support rpath, Meson automatically
    adds rpath entries to built targets using manually found
    external libraries.
  + The Wrap dependency system now supports Subversion (svn). This
    support is rudimentary. The repository url has to point to a
    specific (sub)directory containing the meson.build file
    (typically trunk/). However, providing a revision is
    supported.
- Rebase meson-test-installed-bin.patch.
- Run sed to strip the hashbang from a non-executable file; this
  prevents an rpmlint warning.

- Update to version 0.43.0:
  + Generator learned capture: Generators can now be configured to

OBS-URL: https://build.opensuse.org/request/show/535269
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=65
2017-10-19 15:35:14 +00:00

34 lines
1.8 KiB
Diff

Index: meson-0.43.0/run_project_tests.py
===================================================================
--- meson-0.43.0.orig/run_project_tests.py
+++ meson-0.43.0/run_project_tests.py
@@ -126,7 +126,7 @@ no_meson_log_msg = 'No meson-log.txt fou
system_compiler = None
-meson_command = os.path.join(os.getcwd(), 'meson')
+meson_command = '/usr/bin/meson'
if not os.path.exists(meson_command):
meson_command += '.py'
if not os.path.exists(meson_command):
Index: meson-0.43.0/run_unittests.py
===================================================================
--- meson-0.43.0.orig/run_unittests.py
+++ meson-0.43.0/run_unittests.py
@@ -459,11 +459,11 @@ class BasePlatformTests(unittest.TestCas
# Get the backend
# FIXME: Extract this from argv?
self.backend = getattr(Backend, os.environ.get('MESON_UNIT_TEST_BACKEND', 'ninja'))
- self.meson_args = [os.path.join(src_root, 'meson.py'), '--backend=' + self.backend.name]
+ self.meson_args = ['/usr/bin/meson', '--backend=' + self.backend.name]
self.meson_command = [sys.executable] + self.meson_args
- self.mconf_command = [sys.executable, os.path.join(src_root, 'meson.py'), 'configure']
- self.mintro_command = [sys.executable, os.path.join(src_root, 'meson.py'), 'introspect']
- self.mtest_command = [sys.executable, os.path.join(src_root, 'meson.py'), 'test', '-C', self.builddir]
+ self.mconf_command = [sys.executable, '/usr/bin/meson', 'configure']
+ self.mintro_command = [sys.executable, '/usr/bin/meson', 'introspect']
+ self.mtest_command = [sys.executable, '/usr/bin/meson', 'test', '-C', self.builddir]
# Backend-specific build commands
self.build_command, self.clean_command, self.test_command, self.install_command, \
self.uninstall_command = get_backend_commands(self.backend)