mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-25 19:40:35 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/meson: bump version to 1.10.0

Browse Source 
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>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2025-12-09 20:02:10 +01:00
committed by Julien Olivain
parent 1983c12bd3
commit eb1f160b7a
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch
View File

@@ -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

4
package/meson/meson.hash
View File

@@ -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

2
package/meson/meson.mk
View File

@@ -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