diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-01-29 19:54:15 +0100 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-02-09 11:04:59 -0500 |
| commit | df451f10130fc5d64cf1c65504a69bedd2fbdfdd (patch) | |
| tree | efc457f194ce5312bb59da5791f5f10eaa2bbabf /test cases | |
| parent | d2d9df3121d228797d0b3bccfd614849b637c0fe (diff) | |
| download | meson-df451f10130fc5d64cf1c65504a69bedd2fbdfdd.zip meson-df451f10130fc5d64cf1c65504a69bedd2fbdfdd.tar.gz meson-df451f10130fc5d64cf1c65504a69bedd2fbdfdd.tar.bz2 | |
meson: Allow directory options outside of prefix
This bring us in line with Autotools and CMake and it is useful
for platforms like Nix, which install projects
into multiple independent prefixes.
As a consequence, `get_option` might return absolute paths for some
directory options, if a directory outside of prefix is passed.
This is technically a backwards incompatible change but its effect
should be minimal, thanks to widespread use of `join_paths`/`/` operator
and pkg-config generator module. It should only cause an issue when
a path were constructed by concatenating the value of directory path option.
Also remove a comment about commonpath since we do not use that since
<https://github.com/mesonbuild/meson/commit/00f5dadd5b7d71c30bd7393d165a87f554eb92e5>.
Fixes: https://github.com/mesonbuild/meson/issues/2561
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/failing/38 libdir must be inside prefix/meson.build | 6 | ||||
| -rw-r--r-- | test cases/failing/38 libdir must be inside prefix/test.json | 10 |
2 files changed, 0 insertions, 16 deletions
diff --git a/test cases/failing/38 libdir must be inside prefix/meson.build b/test cases/failing/38 libdir must be inside prefix/meson.build deleted file mode 100644 index 4cce7f8..0000000 --- a/test cases/failing/38 libdir must be inside prefix/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -project('libdir prefix', 'c', - default_options : ['libdir=/opt/lib']) - -if host_machine.system() == 'windows' - error('MESON_SKIP_TEST: this test does not work on Windows since /foo is not absolute') -endif
\ No newline at end of file diff --git a/test cases/failing/38 libdir must be inside prefix/test.json b/test cases/failing/38 libdir must be inside prefix/test.json deleted file mode 100644 index d9256d1..0000000 --- a/test cases/failing/38 libdir must be inside prefix/test.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "do_not_set_opts": [ - "libdir" - ], - "stdout": [ - { - "line": "test cases/failing/38 libdir must be inside prefix/meson.build:1:0: ERROR: The value of the 'libdir' option is '/opt/lib' which must be a subdir of the prefix '/usr'." - } - ] -} |