summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes/build-tools/meson.recipe2
-rw-r--r--recipes/build-tools/meson/0001-vs-Write-out-checksums.patch (renamed from recipes/build-tools/meson/0001-vs-Write-out-checksums-but-not-timestamps.patch)4
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes/build-tools/meson.recipe b/recipes/build-tools/meson.recipe
index fac61764..2a691bcc 100644
--- a/recipes/build-tools/meson.recipe
+++ b/recipes/build-tools/meson.recipe
@@ -28,7 +28,7 @@ class Recipe(recipe.Recipe):
# https://github.com/mesonbuild/meson/pull/5872
'meson/0001-flatten-list-to-subprocess.Popen-necessary-for-Pytho.patch',
# https://github.com/mesonbuild/meson/pull/6451, in 0.54.*
- 'meson/0001-vs-Write-out-checksums-but-not-timestamps.patch',
+ 'meson/0001-vs-Write-out-checksums.patch',
# https://github.com/mesonbuild/meson/pull/6459, in 0.53.1
'meson/0001-find_program-Ignore-programs-in-the-WindowsApps-dire.patch',
]
diff --git a/recipes/build-tools/meson/0001-vs-Write-out-checksums-but-not-timestamps.patch b/recipes/build-tools/meson/0001-vs-Write-out-checksums.patch
index 9d454580..e7730090 100644
--- a/recipes/build-tools/meson/0001-vs-Write-out-checksums-but-not-timestamps.patch
+++ b/recipes/build-tools/meson/0001-vs-Write-out-checksums.patch
@@ -1,7 +1,7 @@
From cba72ac0d542ec5ece716d945b9072dc0a80a9ca Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Sun, 12 Jan 2020 19:45:16 +0530
-Subject: [PATCH] vs: Write out checksums but not timestamps
+Subject: [PATCH] vs: Write out checksums
This is upstream in 0.54.x:
https://github.com/mesonbuild/meson/pull/6451
@@ -21,7 +21,7 @@ index d47694e..ea9b728 100644
def get_linker_always_args(self):
- return ['/nologo']
-+ return ['/nologo', '/release', '/Brepro']
++ return ['/nologo', '/release']
def get_linker_output_args(self, outputname):
return ['/OUT:' + outputname]