summaryrefslogtreecommitdiff
path: root/dev-build/meson
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-03-05 13:06:03 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-03-05 13:06:03 +0000
commitf61d8811e916303cabe9fafdefbe188ba9b500d5 (patch)
tree2af9236d3e678dca4d443b94bfc1b88aec45c669 /dev-build/meson
parent66a7d60eb8beba754ba79c2752cbf70fcf741b0b (diff)
gentoo auto-resync : 05:03:2024 - 13:06:02
Diffstat (limited to 'dev-build/meson')
-rw-r--r--dev-build/meson/Manifest1
-rw-r--r--dev-build/meson/files/meson-1.2.1-llvm-17.patch41
2 files changed, 0 insertions, 42 deletions
diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index db53f64d354e..9502843116f8 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -9,7 +9,6 @@ AUX 1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch 1313 B
AUX 1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch 1092 BLAKE2B 21fd1a0edec2de670d58eab734bf5d86159c73df3016baa7c2c863a5a65b312129aaa90b26e9c64943fba5798ab87090076426f1feb4e67b590a4ed66fca8b6d SHA512 f0f56ce827ced24135d1b571cc0e28a26a21826f3a964ec59fecc16495d9fe69d7f104e53ab05c8555e6d4fc249f4c5c09e9404784aff65a0015c8ea863a74a4
AUX 1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch 4822 BLAKE2B 4746bbb6ddc587df50f1fdff039115aab0715dac5413af495fc4ccf0dc98f4d87e5eb79349ad9b26a365794ea0532f8fdd5bdb3a13257417038f7127a64c3b0b SHA512 03394dab9ca6e777cc7d41cc339da6857bf7728b8c503522948a3c67c257353063159f2bf12d652ace90761d8bae3edeaac5b1c6b125ff4781b6a99fe1a75d79
AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61
-AUX meson-1.2.1-llvm-17.patch 1658 BLAKE2B d111537d4b9befbb848a7da9ffc72f5cebf8caa80f2ab95f5dc3caa30481f3f055dd415e101438cb2f2b4ca8650b3c32a99dfde7029096e05d3cf9bb9ddc1828 SHA512 bc6b2bc1d60343502bf43beb655642bde3d04c10b7c068dba4bae1acec09e7907a9c09ceeacd2e82b35434c2e4f6090cc7df96130650787d4057a46d58b24ea3
AUX meson-1.2.1-python-path.patch 1233 BLAKE2B 0e40fae6cbb9a66929d7f8d5d4e73f6e0105730722ec8db0236fc5376ad58fb4ef961531bf459d69eb4521efa3d26d74332a97fa0012b6107a49b20a86667c33 SHA512 0f072ff2eb310c9884db2fa255a6b7634d69e28f3a1e9ec3782fe63aeec1b544ff0208c5c087bb29ce08dc28a998482a5d3854bcaac372e958b483830d3c8c08
AUX meson-1.3.1-xtools-support.patch 1783 BLAKE2B 8feb8af8c26d4c9b250e2784398f108933140a3a9ec32f281c4d8d0569da2061e0ba7af8826d45695e00e544170131442c0ea900186a99be3e292334aa916b7a SHA512 35ce809d56446fa34e45e18b4d0ac8253d103840aa1820cdff8b5d7959714220b034c2db0654a2d49e622421686d2d27a7e5a7b81faee69f9a6818f056f7eb8f
DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
diff --git a/dev-build/meson/files/meson-1.2.1-llvm-17.patch b/dev-build/meson/files/meson-1.2.1-llvm-17.patch
deleted file mode 100644
index ceee1dcd292b..000000000000
--- a/dev-build/meson/files/meson-1.2.1-llvm-17.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/914576
-https://github.com/mesonbuild/meson/commit/d0b09898c703f6c10ec5a6b2aeace0df2e3570aa
-https://github.com/mesonbuild/meson/commit/9c74c73bc7107c794e7f9896cc4220e50ad32bba
-
-From d0b09898c703f6c10ec5a6b2aeace0df2e3570aa Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sat, 23 Sep 2023 17:21:43 +0200
-Subject: [PATCH] get_llvm_tool_names: add llvm 17
-
-this fixes the "frameworks: 15 llvm" tests with llvm 17
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -157,6 +157,7 @@ def get_llvm_tool_names(tool: str) -> T.List[str]:
- # unless it becomes a stable release.
- suffixes = [
- '', # base (no suffix)
-+ '-17', '17',
- '-16', '16',
- '-15', '15',
- '-14', '14',
-
-From 9c74c73bc7107c794e7f9896cc4220e50ad32bba Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sat, 23 Sep 2023 14:10:29 +0200
-Subject: [PATCH] openmp: add 5.1/5.2, fixes openmp with llvm v17
-
-llvm v17 defaults to 5.1 and without this meson fails to find
-openmp: 'ERROR: Dependency "openmp" not found, tried system'
-
-Add 5.2 as well while at it.
---- a/mesonbuild/dependencies/misc.py
-+++ b/mesonbuild/dependencies/misc.py
-@@ -85,6 +85,8 @@ def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]):
- class OpenMPDependency(SystemDependency):
- # Map date of specification release (which is the macro value) to a version.
- VERSIONS = {
-+ '202111': '5.2',
-+ '202011': '5.1',
- '201811': '5.0',
- '201611': '5.0-revision1', # This is supported by ICC 19.x
- '201511': '4.5',