archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-03-29 00:25:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/meson to 1.6.1-1

Browse source
This commit is contained in:
Kevin Mihelich 2024-12-22 18:35:37 +00:00
parent b290b05b18
commit c1f4f58df5
6 changed files with 75 additions and 65 deletions

26
extra/meson/.SRCINFO
View file

@ -1,7 +1,7 @@
pkgbase = meson
pkgdesc = High productivity build system
pkgver = 1.6.0
pkgrel = 4
pkgver = 1.6.1
pkgrel = 1
url = https://mesonbuild.com/
arch = any
license = Apache-2.0
@ -59,26 +59,24 @@ pkgbase = meson
depends = ninja
depends = python
depends = python-tqdm
source = https://github.com/mesonbuild/meson/releases/download/1.6.0/meson-1.6.0.tar.gz
source = https://github.com/mesonbuild/meson/releases/download/1.6.0/meson-1.6.0.tar.gz.asc
source = meson-reference-1.6.0.3::https://github.com/mesonbuild/meson/releases/download/1.6.0/meson-reference.3
source = meson-reference-1.6.0.json::https://github.com/mesonbuild/meson/releases/download/1.6.0/reference_manual.json
source = https://github.com/mesonbuild/meson/releases/download/1.6.1/meson-1.6.1.tar.gz
source = https://github.com/mesonbuild/meson/releases/download/1.6.1/meson-1.6.1.tar.gz.asc
source = meson-reference-1.6.1.3::https://github.com/mesonbuild/meson/releases/download/1.6.1/meson-reference.3
source = meson-reference-1.6.1.json::https://github.com/mesonbuild/meson/releases/download/1.6.1/reference_manual.json
source = arch-meson
source = cross-lib32
source = native-clang
source = 0001-Skip-broken-tests.patch
source = fix-cmake.diff
source = fix-gir.diff
source = 0002-tests-Avoid-modifying-test-dirs-in-allplatformtests.patch
validpgpkeys = 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70
b2sums = c1d8f143b17fab90c6128a721ac45b9ed6b85d67272149058e74ab827822b6f2c84ebdc261290585e6af38ab5dca52ca013de9b7be70922c96260fc5ee708893
b2sums = 7ccdb3bf3f701fc787fabf91413db8301a8658b89e08c1d712711bd35845dc2468211e4b666cf46ad68ad9462e62b12b62d60c3767a2804f9b695b4390bb8235
b2sums = SKIP
b2sums = 18704b557298da2ea1f3edb4ed6c421bff3f973a215e56b340de2e78b1330e13eb00830cf44c3a8d04fd685ec6f8e6d078a4b9f03cf5b9e5413cbbfce55a22dd
b2sums = 4d3bbf98706fd5c1e80da562ea2e737625db455e2eea30d1457a78862afa0b51456d5368abe19542cd524bd96d14d5cb33a22909d988be17e6ecb26929c49bb2
b2sums = 55df822192781a70e4bc44cfe14fb363e3f820406260ca9705d7fdb5fad1bf0117e3f1325d37e58e23477bc075ab6bd84056409355ec694f72eeaa5bf982ecc7
b2sums = ba2e37d7cf18adfefbff230f140b702b87b22ee409de9dc5407afbe153b90cb66ab6d4063c4b4ce72cbcef2db84288981d52c47698fc7cc2e181924be651c0fa
b2sums = 70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af
b2sums = 9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081
b2sums = 7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e
b2sums = f23df4324b30b81f1756a9b443dd35185c4e8717b31fafcd2479071b6f38a8ee0776e97a3cd21a7921a6da892685a45632f6f8282007123b2dd5745492768f54
b2sums = 8e75e4f6cac65cef19dade915528d05fedecf83586c482db17ebe1ed6399f1539fa74687fb7dad9747b8d2b2ca2fcfe89af049e19aedf489d34de93aec61dcbb
b2sums = 8f00fa21777fe012b6e3cb880b0442ba9074d90ab8a2c7b7c67e8c69e418ef0625a047f372f68c43b775f95c36f9119d6997fd337f2296b036e89e306346abbd
b2sums = 41b5d1fea3ef014b9c52f292bf35bf87f589909a4de316ca324fb717f997a36cfc7bcd82c6f18039ea066131cd630381d275984fb9f3462d468a93d1ca437b2d
b2sums = 9202300b5ddac7017fdc1865a4e4298f606d39e39ccb379284de998decc621491761804bb88f7e1b2cd8893e5f8f7300f3b37f305ef3cbad40ee4693418e8167
pkgname = meson

2
extra/meson/0001-Skip-broken-tests.patch
View file

@ -22,7 +22,7 @@ index 812dcf9c5c19..cb25be2f36bd 100644
dep = dependency('ZLIB', version : '>=1.2', method : 'cmake')
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
index 3ac98076095c..ea3d950d1a5f 100644
index 55e83750af34..f89e5889b3f4 100644
--- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py
@@ -313,6 +313,7 @@ class LinuxlikeTests(BasePlatformTests):

53
extra/meson/0002-tests-Avoid-modifying-test-dirs-in-allplatformtests.patch Normal file
View file

@ -0,0 +1,53 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Mon, 9 Dec 2024 16:18:50 +0100
Subject: [PATCH] tests: Avoid modifying test dirs in allplatformtests
Tests can tread on each other's toes when parallelism is high enough.
For a concrete case, `test_prebuilt_shared_lib` creates an object file
in the `17 prebuilt shared` test dir.
`test_prebuilt_shared_lib_rpath_same_prefix` uses `shutil.copytree` to
copy that same test dir to a temporary location.
If the former test cleans up its object file while `copytree` is
running, the copy can fail with a fatal ENOENT `shutil.Error`.
Use `copy_srcdir` in all tests that modify the testdir (that I spotted)
to prevent this from happening.
---
unittests/allplatformstests.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index cadbc40e9680..69bdb12d3f4a 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -1732,7 +1732,7 @@ class AllPlatformTests(BasePlatformTests):
def test_prebuilt_static_lib(self):
(cc, stlinker, object_suffix, _) = self.detect_prebuild_env()
- tdir = os.path.join(self.unit_test_dir, '16 prebuilt static')
+ tdir = self.copy_srcdir(os.path.join(self.unit_test_dir, '16 prebuilt static'))
source = os.path.join(tdir, 'libdir/best.c')
objectfile = os.path.join(tdir, 'libdir/best.' + object_suffix)
stlibfile = os.path.join(tdir, 'libdir/libbest.a')
@@ -1766,7 +1766,7 @@ class AllPlatformTests(BasePlatformTests):
def test_prebuilt_shared_lib(self):
(cc, _, object_suffix, shared_suffix) = self.detect_prebuild_env()
- tdir = os.path.join(self.unit_test_dir, '17 prebuilt shared')
+ tdir = self.copy_srcdir(os.path.join(self.unit_test_dir, '17 prebuilt shared'))
source = os.path.join(tdir, 'alexandria.c')
objectfile = os.path.join(tdir, 'alexandria.' + object_suffix)
impfile = os.path.join(tdir, 'alexandria.lib')
@@ -1981,7 +1981,7 @@ class AllPlatformTests(BasePlatformTests):
https://github.com/mesonbuild/meson/issues/2785
'''
(cc, stlinker, objext, shext) = self.detect_prebuild_env()
- testdir = os.path.join(self.unit_test_dir, '18 pkgconfig static')
+ testdir = self.copy_srcdir(os.path.join(self.unit_test_dir, '18 pkgconfig static'))
source = os.path.join(testdir, 'foo.c')
objectfile = os.path.join(testdir, 'foo.' + objext)
stlibfile = os.path.join(testdir, 'libfoo.a')

27
extra/meson/PKGBUILD
View file

@ -6,8 +6,8 @@
# - disable lto in arch-meson
pkgname=meson
pkgver=1.6.0
pkgrel=4
pkgver=1.6.1
pkgrel=1
pkgdesc="High productivity build system"
url="https://mesonbuild.com/"
arch=(any)
@ -80,19 +80,17 @@ source=(
cross-lib32
native-clang
0001-Skip-broken-tests.patch
fix-cmake.diff
fix-gir.diff
0002-tests-Avoid-modifying-test-dirs-in-allplatformtests.patch
)
b2sums=('c1d8f143b17fab90c6128a721ac45b9ed6b85d67272149058e74ab827822b6f2c84ebdc261290585e6af38ab5dca52ca013de9b7be70922c96260fc5ee708893'
b2sums=('7ccdb3bf3f701fc787fabf91413db8301a8658b89e08c1d712711bd35845dc2468211e4b666cf46ad68ad9462e62b12b62d60c3767a2804f9b695b4390bb8235'
'SKIP'
'18704b557298da2ea1f3edb4ed6c421bff3f973a215e56b340de2e78b1330e13eb00830cf44c3a8d04fd685ec6f8e6d078a4b9f03cf5b9e5413cbbfce55a22dd'
'4d3bbf98706fd5c1e80da562ea2e737625db455e2eea30d1457a78862afa0b51456d5368abe19542cd524bd96d14d5cb33a22909d988be17e6ecb26929c49bb2'
'55df822192781a70e4bc44cfe14fb363e3f820406260ca9705d7fdb5fad1bf0117e3f1325d37e58e23477bc075ab6bd84056409355ec694f72eeaa5bf982ecc7'
'ba2e37d7cf18adfefbff230f140b702b87b22ee409de9dc5407afbe153b90cb66ab6d4063c4b4ce72cbcef2db84288981d52c47698fc7cc2e181924be651c0fa'
'70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af'
'9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081'
'7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e'
'f23df4324b30b81f1756a9b443dd35185c4e8717b31fafcd2479071b6f38a8ee0776e97a3cd21a7921a6da892685a45632f6f8282007123b2dd5745492768f54'
'8e75e4f6cac65cef19dade915528d05fedecf83586c482db17ebe1ed6399f1539fa74687fb7dad9747b8d2b2ca2fcfe89af049e19aedf489d34de93aec61dcbb'
'8f00fa21777fe012b6e3cb880b0442ba9074d90ab8a2c7b7c67e8c69e418ef0625a047f372f68c43b775f95c36f9119d6997fd337f2296b036e89e306346abbd')
'41b5d1fea3ef014b9c52f292bf35bf87f589909a4de316ca324fb717f997a36cfc7bcd82c6f18039ea066131cd630381d275984fb9f3462d468a93d1ca437b2d'
'9202300b5ddac7017fdc1865a4e4298f606d39e39ccb379284de998decc621491761804bb88f7e1b2cd8893e5f8f7300f3b37f305ef3cbad40ee4693418e8167')
validpgpkeys=(
19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen <jpakkane@gmail.com>
)
@ -102,14 +100,7 @@ prepare() {
# Pass tests
patch -Np1 -i ../0001-Skip-broken-tests.patch
# Unbreak CMake
# https://github.com/mesonbuild/meson/issues/13888
patch -Np1 -i ../fix-cmake.diff
# Unbreak GIR
# https://github.com/mesonbuild/meson/issues/13850
patch -Np1 -i ../fix-gir.diff
patch -Np1 -i ../0002-tests-Avoid-modifying-test-dirs-in-allplatformtests.patch
}
build() {

15
extra/meson/fix-cmake.diff
View file

@ -1,15 +0,0 @@
mesonbuild/cmake/interpreter.py | 1 +
1 file changed, 1 insertion(+)
diff --git c/mesonbuild/cmake/interpreter.py i/mesonbuild/cmake/interpreter.py
index fafee86ab..12d7049d2 100644
--- c/mesonbuild/cmake/interpreter.py
+++ i/mesonbuild/cmake/interpreter.py
@@ -828,6 +828,7 @@ class CMakeInterpreter:
cmake_args = []
cmake_args += cmake_get_generator_args(self.env)
+ cmake_args += ['-DCMAKE_LINK_DEPENDS_USE_LINKER=FALSE']
cmake_args += [f'-DCMAKE_INSTALL_PREFIX={self.install_prefix}']
cmake_args += extra_cmake_options
if not any(arg.startswith('-DCMAKE_BUILD_TYPE=') for arg in cmake_args):

17
extra/meson/fix-gir.diff
View file

@ -1,17 +0,0 @@
mesonbuild/modules/gnome.py | 3 +++
1 file changed, 3 insertions(+)
diff --git c/mesonbuild/modules/gnome.py i/mesonbuild/modules/gnome.py
index e0c1214d0..5a7160d60 100644
--- c/mesonbuild/modules/gnome.py
+++ i/mesonbuild/modules/gnome.py
@@ -667,6 +667,9 @@ class GnomeModule(ExtensionModule):
assert isinstance(girdir, str), 'for mypy'
gi_includes.update([girdir])
if isinstance(dep, InternalDependency):
+ # Ensure BothLibraries are resolved
+ dep = dep.get_as_shared(recursive=True)
+
cflags.update(dep.get_compile_args())
cflags.update(state.get_include_args(dep.include_directories))
for lib in dep.libraries: