pyrox.dev
Merge pull request #37935 from jtojnar/meson-0.45
meson: 0.44.0 → 0.45.1
authored by Jan Tojnar and committed by GitHub 372b00df a283292d
+3
-3
pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
+3
-3
pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
···
1
--- a/mesonbuild/coredata.py
2
+++ b/mesonbuild/coredata.py
3
-
@@ -266,18 +266,13 @@
4
'''
5
if option.endswith('dir') and os.path.isabs(value) and \
6
option not in builtin_dir_noprefix_options:
···
8
# commonpath will always return a path in the native format, so we
9
# must use pathlib.PurePath to do the same conversion before
10
# comparing.
11
-
- if commonpath([value, prefix]) != str(PurePath(prefix)):
12
- m = 'The value of the {!r} option is {!r} which must be a ' \
13
- 'subdir of the prefix {!r}.\nNote that if you pass a ' \
14
- 'relative path, it is assumed to be a subdir of prefix.'
···
16
- # Convert path to be relative to prefix
17
- skip = len(prefix) + 1
18
- value = value[skip:]
19
-
+ if commonpath([value, prefix]) == str(PurePath(prefix)):
20
+ # Convert path to be relative to prefix
21
+ skip = len(prefix) + 1
22
+ value = value[skip:]
···
1
--- a/mesonbuild/coredata.py
2
+++ b/mesonbuild/coredata.py
3
+
@@ -282,18 +282,13 @@
4
'''
5
if option.endswith('dir') and os.path.isabs(value) and \
6
option not in builtin_dir_noprefix_options:
···
8
# commonpath will always return a path in the native format, so we
9
# must use pathlib.PurePath to do the same conversion before
10
# comparing.
11
+
- if os.path.commonpath([value, prefix]) != str(PurePath(prefix)):
12
- m = 'The value of the {!r} option is {!r} which must be a ' \
13
- 'subdir of the prefix {!r}.\nNote that if you pass a ' \
14
- 'relative path, it is assumed to be a subdir of prefix.'
···
16
- # Convert path to be relative to prefix
17
- skip = len(prefix) + 1
18
- value = value[skip:]
19
+
+ if os.path.commonpath([value, prefix]) == str(PurePath(prefix)):
20
+ # Convert path to be relative to prefix
21
+ skip = len(prefix) + 1
22
+ value = value[skip:]
+8
-3
pkgs/development/tools/build-managers/meson/default.nix
+8
-3
pkgs/development/tools/build-managers/meson/default.nix
···
1
-
{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, substituteAll }: let
2
targetPrefix = lib.optionalString stdenv.isCross
3
(targetPlatform.config + "-");
4
in python3Packages.buildPythonApplication rec {
5
-
version = "0.44.0";
6
pname = "meson";
7
name = "${pname}-${version}";
8
9
src = python3Packages.fetchPypi {
10
inherit pname version;
11
-
sha256 = "1rpqp9iwbvr4xvfdh3iyfh1ha274hbb66jbgw3pa5a73x4d4ilqn";
12
};
13
14
postFixup = ''
···
68
cpu = '${targetPlatform.parsed.cpu.name}'
69
endian = ${if targetPlatform.isLittleEndian then "'little'" else "'big'"}
70
'';
71
72
inherit (stdenv) cc isCross;
73
···
1
+
{ lib, python3Packages, stdenv, ninja, pkgconfig, targetPlatform, writeTextDir, substituteAll }: let
2
targetPrefix = lib.optionalString stdenv.isCross
3
(targetPlatform.config + "-");
4
in python3Packages.buildPythonApplication rec {
5
+
version = "0.45.1";
6
pname = "meson";
7
name = "${pname}-${version}";
8
9
src = python3Packages.fetchPypi {
10
inherit pname version;
11
+
sha256 = "154kxx49dbw7p30qfg1carb3mgqxx9hyy1r0yzfsg07hz1n2sq14";
12
};
13
14
postFixup = ''
···
68
cpu = '${targetPlatform.parsed.cpu.name}'
69
endian = ${if targetPlatform.isLittleEndian then "'little'" else "'big'"}
70
'';
71
+
72
+
# 0.45 update enabled tests but they are failing
73
+
doCheck = false;
74
+
# checkInputs = [ ninja pkgconfig ];
75
+
# checkPhase = "python ./run_project_tests.py";
76
77
inherit (stdenv) cc isCross;
78