From 70a777bb666764af476514bc6aa4e29c79abf7cf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Oct 2024 23:25:59 +0100 Subject: [PATCH] package/meson: bump version to 1.6.0 Updated patch 0001 due to upstream PR https://github.com/mesonbuild/meson/pull/13368 Release notes: https://mesonbuild.com/Release-notes-for-1-4-0.html https://mesonbuild.com/Release-notes-for-1-5-0.html https://mesonbuild.com/Release-notes-for-1-6-0.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...atic-libs-when-default-library-static.patch | 18 ++++++++++++++---- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch b/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch index 9cedcd0942..55f7512e2e 100644 --- a/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch +++ b/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch @@ -24,6 +24,8 @@ http://autobuild.buildroot.net/results/c17/c17bbb12d9deadd64a441b36e324cfbbe8aba Signed-off-by: Matthew Weber [Updated for 0.57.1 - get_builtin_option() vs. get_option(OptionKey())] Signed-off-by: Peter Seiderer +[Bernd: rebased for 1.6.0] +Signed-off-by: Bernd Kuhls --- mesonbuild/compilers/mixins/clike.py | 3 +++ 1 file changed, 3 insertions(+) @@ -32,10 +34,18 @@ diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/ index 09ad837b1..b7f6b9f22 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py -@@ -978,6 +978,9 @@ class CLikeCompiler(Compiler): - elif env.machines[self.for_machine].is_cygwin(): - shlibext = ['dll', 'dll.a'] - prefixes = ['cyg'] + prefixes +@@ -27,6 +27,7 @@ + from ... import mlog + from ...linkers.linkers import GnuLikeDynamicLinkerMixin, SolarisDynamicLinker, CompCertDynamicLinker + from ...mesonlib import LibType ++from ...options import OptionKey + from .. import compilers + from ..compilers import CompileCheckMode + from .visualstudio import VisualStudioLikeCompiler +@@ -1038,6 +1038,9 @@ class CLikeCompiler(Compiler): + # TI C6000 compiler can use both extensions for static or dynamic libs. + stlibext = ['a', 'lib'] + shlibext = ['dll', 'so'] + elif env.coredata.get_option(OptionKey('default_library')) == 'static': + # Linux/BSDs + shlibext = ['a'] diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 150fd6d1bb..e02d878d79 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1.tar.gz.asc -sha256 6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7 meson-1.3.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.6.0/meson-1.6.0.tar.gz.asc +sha256 999b65f21c03541cf11365489c1fad22e2418bb0c3d50ca61139f2eec09d5496 meson-1.6.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 467569d28b..f36091e584 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 1.3.1 +MESON_VERSION = 1.6.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING