diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-08-17 09:31:54 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-17 09:31:54 +0100 |
commit | 5a21cec0c36dba03507dcbd5e8ab6698d00b39bf (patch) | |
tree | aa76c2f85f9c77c2f9a5af47ae0aa6509585770a /dev-util/meson | |
parent | 280d9db9f9470686aae5ce1fa4cfa57b26e9beb2 (diff) |
gentoo auto-resync : 17:08:2023 - 09:31:54
Diffstat (limited to 'dev-util/meson')
-rw-r--r-- | dev-util/meson/Manifest | 3 | ||||
-rw-r--r-- | dev-util/meson/files/meson-1.2.1-python-path.patch | 26 | ||||
-rw-r--r-- | dev-util/meson/meson-1.2.1-r1.ebuild (renamed from dev-util/meson/meson-1.2.1.ebuild) | 4 |
3 files changed, 32 insertions, 1 deletions
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index 93fe79dcc893..5dc49b9328e8 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -1,9 +1,10 @@ AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61 +AUX meson-1.2.1-python-path.patch 1233 BLAKE2B 0e40fae6cbb9a66929d7f8d5d4e73f6e0105730722ec8db0236fc5376ad58fb4ef961531bf459d69eb4521efa3d26d74332a97fa0012b6107a49b20a86667c33 SHA512 0f072ff2eb310c9884db2fa255a6b7634d69e28f3a1e9ec3782fe63aeec1b544ff0208c5c087bb29ce08dc28a998482a5d3854bcaac372e958b483830d3c8c08 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb DIST meson-1.2.0.tar.gz 2182568 BLAKE2B a8239c41ab5d20c26c057293dc85e5577eb9e6eef7a39acc67a0b5b1e82b1afae341936431d96571ff83e96b7648a80a16cfd8eb581ff29b2ca88615657d5ca3 SHA512 8b5768cf0dab5f88d2f3e3962305910e707ff810cbd21b5997aab0bb6abe1c4d5dbd24ec59ab4072f1faa9b81daa8be993d56679445afa93700676f52e314d23 DIST meson-1.2.1.tar.gz 2182126 BLAKE2B b79fa78618cbebfb26ea40e698c495e63d722ba3204d4fed92d087e4a588b49666b476c55916f1435b7ca62f24843c683f1da09751754e928c838c1bf138ce58 SHA512 6221a14a6046aaba2c6eb601a9a5b928308bbd9da813ccec16b8f7578296b27d741e30e9343723770c3c7825c86b53193b41b9672dd17468d06d3b8d743bf52e EBUILD meson-1.1.1.ebuild 2938 BLAKE2B 1896e10e1d442716eaf50b776bdb52c6d438c9a3a6f2e3b5125f4de2f5bd01932dbd12a6e69016032defafd7a62068f810090342b766a8b14928bc38f3e72946 SHA512 3038284a26a397055050c8236b6c13f7a7b01ce94faa5f299dbf180366aed166bc3a22443febb5c9c32e966f789dec63b8e5ea293a976c871d86647afe529249 EBUILD meson-1.2.0.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2 -EBUILD meson-1.2.1.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2 +EBUILD meson-1.2.1-r1.ebuild 2937 BLAKE2B 108fdc572cbe9b4b0b39e64c15aed62d79c889c151837cc2abbd5a78c1a6667d27511df47e273c4a6a6ecbfe71a442877d73ac8fc8deee8e415b338838c39d69 SHA512 f6682ba580cb130d18371b22961919ab94ca15f94af6265828eed8efc5b7d4efd330facbc25808009d697d86f9900ac48ea253c80e6a04f1d79e60b935c1acae EBUILD meson-9999.ebuild 2886 BLAKE2B 3cc344e676d5c260f20942469e01da9bd6be5578cde92be8c91d55b80d3b18c018e16497b6f1015427fc65d712d5520db598d35f53e2035911718cc8ed27c588 SHA512 22ccf7c0a146e90e69eea1a821fdeeed0f240b6b6e071782a877ffad04038dae09cfa1370fb438036cd3cb04dd0889a477c1cdfe94f9e578cdec81a85a6036c2 MISC metadata.xml 348 BLAKE2B 101a8ed796dd4fe7bc790c1f4d1f693948c80ff57ceae9500d8034b007cb067e3e0277f1f6423d92b847da07a96a4a4bf405a2e0d0dfa8c07846aac195c26012 SHA512 8ffe88b93e7f0bbfa4fbd9b3b7e318b2df1da076b0e7ee47f4f520c44207f2f507efc7b1cbc9b6f8d432938a805e4ceb922a6f477836f64ea8a12d9e0d361740 diff --git a/dev-util/meson/files/meson-1.2.1-python-path.patch b/dev-util/meson/files/meson-1.2.1-python-path.patch new file mode 100644 index 000000000000..d6151881f83f --- /dev/null +++ b/dev-util/meson/files/meson-1.2.1-python-path.patch @@ -0,0 +1,26 @@ +From 2b33c94e6315e9a397dd48a58a5becb0df3b8aba Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sat, 12 Aug 2023 09:56:44 +0100 +Subject: [PATCH 2/2] python module: Respect PATH when python is not given in + machine file + +We should only fall back to the Python interpreter running Meson itself +if `python3` is not found in the PATH. + +https://github.com/mesonbuild/meson/pull/12116 + +diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py +index 5654e4231..2b2395a9b 100644 +--- a/mesonbuild/modules/python.py ++++ b/mesonbuild/modules/python.py +@@ -381,7 +381,9 @@ class PythonModule(ExtensionModule): + + def _find_installation_impl(self, state: 'ModuleState', display_name: str, name_or_path: str, required: bool) -> MaybePythonProg: + if not name_or_path: +- python = PythonExternalProgram('python3', mesonlib.python_command) ++ python = PythonExternalProgram('python3') ++ if not python.found(): ++ python = PythonExternalProgram('python3', mesonlib.python_command) + else: + tmp_python = ExternalProgram.from_entry(display_name, name_or_path) + python = PythonExternalProgram(display_name, ext_prog=tmp_python) diff --git a/dev-util/meson/meson-1.2.1.ebuild b/dev-util/meson/meson-1.2.1-r1.ebuild index fefd68d177e5..2f54a0120763 100644 --- a/dev-util/meson/meson-1.2.1.ebuild +++ b/dev-util/meson/meson-1.2.1-r1.ebuild @@ -44,6 +44,10 @@ RDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${P}-python-path.patch +) + python_prepare_all() { local disable_unittests=( # ASAN and sandbox both want control over LD_PRELOAD |