mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-10 16:24:17 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/meson: bump version to 1.8.2

Browse Source 
Release notes:
https://mesonbuild.com/Release-notes-for-1-8-0.html

Updated patch 0001 due to upstream commit
4fa5292545

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Tested-by: Julien Olivain <ju.o@free.fr>
[Julien: fix patch line offsets]
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2025-06-15 18:19:57 +02:00
committed by Julien Olivain
parent c17ce03793
commit b753f29494
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,8 @@ 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]
[Bernd: rebased for 1.6.0 & 1.7.0
for 1.82.0 - get_option -> optstore.get_value_for]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
mesonbuild/compilers/mixins/clike.py | 3 +++
@@ -42,11 +43,11 @@ index 09ad837b1..b7f6b9f22 100644
from .. import compilers
from ..compilers import CompileCheckMode
from .visualstudio import VisualStudioLikeCompiler
@@ -1053,6 +1053,9 @@ class CLikeCompiler(Compiler):
@@ -1053,6 +1054,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.get_option(OptionKey('default_library')) == 'static':
+ elif env.coredata.optstore.get_value_for(OptionKey('default_library')) == 'static':
+ # Linux/BSDs
+ shlibext = ['a']
else:

2
package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch
View File

@@ -30,7 +30,7 @@ diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgc
index e86206b88..94888657d 100644
--- a/mesonbuild/dependencies/pkgconfig.py
+++ b/mesonbuild/dependencies/pkgconfig.py
@@ -169,7 +169,8 @@ class PkgConfigCLI(PkgConfigInterface):
@@ -170,7 +170,8 @@ class PkgConfigCLI(PkgConfigInterface):
env['PKG_CONFIG_ALLOW_SYSTEM_LIBS'] = '1'
args: T.List[str] = []
args += self._define_variable_args(define_variable)

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.7.0/meson-1.7.0.tar.gz.asc
sha256 08efbe84803eed07f863b05092d653a9d348f7038761d900412fddf56deb0284 meson-1.7.0.tar.gz
# https://github.com/mesonbuild/meson/releases/download/1.8.2/meson-1.8.2.tar.gz.asc
sha256 c105816d8158c76b72adcb9ff60297719096da7d07f6b1f000fd8c013cd387af meson-1.8.2.tar.gz
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING

2
package/meson/meson.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
MESON_VERSION = 1.7.0
MESON_VERSION = 1.8.2
MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
MESON_LICENSE = Apache-2.0
MESON_LICENSE_FILES = COPYING