gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: 1.5.1 -> 1.5.2 (#343343)

Browse Source
This commit is contained in:
K900
2024-09-21 05:53:51 +03:00
committed by GitHub
parent bfb2d3647c 47f16e4b74
commit ba0099faf7
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/me/meson/006-disable-bitcode.patch
+9 -3
View File
@@ -1,6 +1,8 @@
diff --git a/mesonbuild/compilers/mixins/clang.py b/mesonbuild/compilers/mixins/clang.py
index d99dc3abf..6b8f75165 100644
--- a/mesonbuild/compilers/mixins/clang.py
+++ b/mesonbuild/compilers/mixins/clang.py
@@ -56,10 +56,6 @@ class ClangCompiler(GnuLikeCompiler):
@@ -54,11 +54,7 @@ class ClangCompiler(GnuLikeCompiler):
{OptionKey('b_colorout'), OptionKey('b_lto_threads'), OptionKey('b_lto_mode'), OptionKey('b_thinlto_cache'),
OptionKey('b_thinlto_cache_dir')})
@@ -8,12 +10,16 @@
- # linkers don't have base_options.
- if isinstance(self.linker, AppleDynamicLinker):
- self.base_options.add(OptionKey('b_bitcode'))
- elif isinstance(self.linker, MSVCDynamicLinker):
+ if isinstance(self.linker, MSVCDynamicLinker):
self.base_options.add(OptionKey('b_vscrt'))
# All Clang backends can also do LLVM IR
self.can_compile_suffixes.add('ll')
diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
index 4eec82edd..6db5c6af0 100644
--- a/mesonbuild/linkers/linkers.py
+++ b/mesonbuild/linkers/linkers.py
@@ -785,7 +785,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
@@ -796,7 +796,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker):
return self._apply_prefix('-headerpad_max_install_names')
def bitcode_args(self) -> T.List[str]:
pkgs/by-name/me/meson/package.nix
+2 -2
View File
@@ -21,13 +21,13 @@ let
in
python3.pkgs.buildPythonApplication rec {
pname = "meson";
version = "1.5.1";
version = "1.5.2";
src = fetchFromGitHub {
owner = "mesonbuild";
repo = "meson";
rev = "refs/tags/${version}";
hash = "sha256-BqsEO1a93a8d7/UH232buSPBt+WSNJbw1DGYA2nm9rs=";
hash = "sha256-cesMepnD3fHX2CwnSQ3c5TE9kPSa0FkCVVVZDgXwo8M=";
};
patches = [