NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/meson: bump to version 0.59.0

Browse Source 
Rebase patches on 0.59.0.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
James Hilliard 2021-08-12 15:43:20 -06:00 committed by Thomas Petazzoni
parent 2ff40658ac
commit 372ccf6a19
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From cf9ad9b79a924081ce3d1e045bba3544815ea5f8 Mon Sep 17 00:00:00 2001
From c1359a49b61016031287d62f44a363cb76242c91 Mon Sep 17 00:00:00 2001
From: Matt Weber <matthew.weber@rockwellcollins.com>
Date: Sat, 26 Oct 2019 09:17:29 -0500
Subject: [PATCH] Prefer ext static libs when --default-library=static
@ -29,10 +29,10 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net>
1 file changed, 3 insertions(+)
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py
index ad3bfae..4733910 100644
index 09ad837b1..b7f6b9f22 100644
--- a/mesonbuild/compilers/mixins/clike.py
+++ b/mesonbuild/compilers/mixins/clike.py
@@ -999,6 +999,9 @@ class CLikeCompiler(Compiler):
@@ -978,6 +978,9 @@ class CLikeCompiler(Compiler):
elif env.machines[self.for_machine].is_cygwin():
shlibext = ['dll', 'dll.a']
prefixes = ['cyg'] + prefixes
@ -43,5 +43,5 @@ index ad3bfae..4733910 100644
# Linux/BSDs
shlibext = ['so']
--
2.30.1
2.25.1

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

@ -1,4 +1,4 @@
From 885af6ab2e02cca6bd190b8b29a355fdb6516936 Mon Sep 17 00:00:00 2001
From 3d6a2db2270346236dd6247e0648ea0c949ba468 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sat, 15 Feb 2020 15:13:59 +0100
Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static
@ -21,23 +21,23 @@ Signed-off-by: Romain Naour <romain.naour@gmail.com>
[Rebased on 0.57.1]
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
mesonbuild/dependencies/base.py | 3 ++-
mesonbuild/dependencies/pkgconfig.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index cd77b4b..08675e6 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -883,7 +883,8 @@ class PkgConfigDependency(ExternalDependency):
diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py
index 1e8d9132e..d902ba215 100644
--- a/mesonbuild/dependencies/pkgconfig.py
+++ b/mesonbuild/dependencies/pkgconfig.py
@@ -338,7 +338,8 @@ class PkgConfigDependency(ExternalDependency):
env = None
libcmd = ['--libs']
- if self.static:
+ if self.static or \
+ (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'):
+ (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'):
libcmd.append('--static')
libcmd.append(self.name)
--
2.30.1
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/0.58.2/meson-0.58.2.tar.gz.asc
sha256 7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7 meson-0.58.2.tar.gz
# https://github.com/mesonbuild/meson/releases/download/0.59.0/meson-0.59.0.tar.gz.asc
sha256 e376c298df64b643dfe01eccb2d7b6f1e02e95aa38c19f19d120d129612ce476 meson-0.59.0.tar.gz
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING

2
package/meson/meson.mk
View File

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