Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH/next 1/1] package/meson: bump version to 1.10.0
@ 2025-12-09 19:02 Bernd Kuhls
  2025-12-09 20:46 ` Julien Olivain via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Bernd Kuhls @ 2025-12-09 19:02 UTC (permalink / raw)
  To: buildroot; +Cc: Eric Le Bihan

Release notes: https://mesonbuild.com/Release-notes-for-1-10-0.html

Rebased and updated patch 0001 to fix build error:

    NameError: name 'env' is not defined

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 ...xt-static-libs-when-default-library-static.patch | 13 ++++++-------
 package/meson/meson.hash                            |  4 ++--
 package/meson/meson.mk                              |  2 +-
 3 files changed, 9 insertions(+), 10 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 c7f8557ec1..92d5e517a4 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,8 +24,7 @@ http://autobuild.buildroot.net/results/c17/c17bbb12d9deadd64a441b36e324cfbbe8aba
 Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
 [Updated for 0.57.1 - get_builtin_option() vs. get_option(OptionKey())]
 Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-[Bernd: rebased for 1.6.0 & 1.7.0
- for 1.82.0 - get_option -> optstore.get_value_for]
+[Bernd: rebased for 1.10.0]
 Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
 ---
  mesonbuild/compilers/mixins/clike.py | 3 +++
@@ -43,16 +42,16 @@ index 09ad837b1..b7f6b9f22 100644
  from .. import compilers
  from ..compilers import CompileCheckMode
  from .visualstudio import VisualStudioLikeCompiler
-@@ -1053,6 +1054,9 @@ class CLikeCompiler(Compiler):
+@@ -1045,6 +1046,9 @@ class CLikeCompiler(Compiler):
              # TI C28x compilers can use both extensions for static or dynamic libs.
              stlibext = ['a', 'lib']
              shlibext = ['dll', 'so']
-+        elif env.coredata.optstore.get_value_for(OptionKey('default_library')) == 'static':
++        elif self.environment.coredata.optstore.get_value_for(OptionKey('default_library')) == 'static':
 +            # Linux/BSDs
 +            shlibext = ['a']
-         else:
-             # Linux/BSDs
-             shlibext = ['so']
+         elif self.info.is_os2():
+             stlibext = ['_s.lib', '_s.a', 'lib', 'a']
+             shlibext = ['_dll.lib', '_dll.a', 'lib', 'a', 'dll']
 -- 
 2.25.1
 
diff --git a/package/meson/meson.hash b/package/meson/meson.hash
index 581cfe62a7..d07ea4d1dd 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.9.1/meson-1.9.1.tar.gz.asc
-sha256  4e076606f2afff7881d195574bddcd8d89286f35a17b4977a216f535dc0c74ac  meson-1.9.1.tar.gz
+# https://github.com/mesonbuild/meson/releases/download/1.10.0/meson-1.10.0.tar.gz.asc
+sha256  8071860c1f46a75ea34801490fd1c445c9d75147a65508cd3a10366a7006cc1c  meson-1.10.0.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  COPYING
diff --git a/package/meson/meson.mk b/package/meson/meson.mk
index 29082dcbb5..ca42edf63b 100644
--- a/package/meson/meson.mk
+++ b/package/meson/meson.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MESON_VERSION = 1.9.1
+MESON_VERSION = 1.10.0
 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
 MESON_LICENSE = Apache-2.0
 MESON_LICENSE_FILES = COPYING
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [PATCH/next 1/1] package/meson: bump version to 1.10.0
  2025-12-09 19:02 [Buildroot] [PATCH/next 1/1] package/meson: bump version to 1.10.0 Bernd Kuhls
@ 2025-12-09 20:46 ` Julien Olivain via buildroot
  0 siblings, 0 replies; 2+ messages in thread
From: Julien Olivain via buildroot @ 2025-12-09 20:46 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: buildroot, Eric Le Bihan

On 09/12/2025 20:02, Bernd Kuhls wrote:
> Release notes: https://mesonbuild.com/Release-notes-for-1-10-0.html
> 
> Rebased and updated patch 0001 to fix build error:
> 
>     NameError: name 'env' is not defined
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Applied to next, thanks.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-12-09 20:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-09 19:02 [Buildroot] [PATCH/next 1/1] package/meson: bump version to 1.10.0 Bernd Kuhls
2025-12-09 20:46 ` Julien Olivain via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox