mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
extra/meson to 1.3.2-1
This commit is contained in:
Kevin Mihelich
parent
db18381406
commit
8dd0207c8c
5 changed files with 21 additions and 46 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
pkgbase = meson
|
pkgbase = meson
|
||||||
pkgdesc = High productivity build system
|
pkgdesc = High productivity build system
|
||||||
pkgver = 1.3.1
|
pkgver = 1.3.2
|
||||||
pkgrel = 2
|
pkgrel = 1
|
||||||
url = https://mesonbuild.com/
|
url = https://mesonbuild.com/
|
||||||
arch = any
|
arch = any
|
||||||
license = Apache
|
license = Apache
|
||||||
|
|
@ -56,26 +56,24 @@ pkgbase = meson
|
||||||
depends = ninja
|
depends = ninja
|
||||||
depends = python-tqdm
|
depends = python-tqdm
|
||||||
depends = python-typing_extensions
|
depends = python-typing_extensions
|
||||||
source = https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1.tar.gz
|
source = https://github.com/mesonbuild/meson/releases/download/1.3.2/meson-1.3.2.tar.gz
|
||||||
source = https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1.tar.gz.asc
|
source = https://github.com/mesonbuild/meson/releases/download/1.3.2/meson-1.3.2.tar.gz.asc
|
||||||
source = meson-reference-1.3.1.3::https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-reference.3
|
source = meson-reference-1.3.2.3::https://github.com/mesonbuild/meson/releases/download/1.3.2/meson-reference.3
|
||||||
source = meson-reference-1.3.1.json::https://github.com/mesonbuild/meson/releases/download/1.3.1/reference_manual.json
|
source = meson-reference-1.3.2.json::https://github.com/mesonbuild/meson/releases/download/1.3.2/reference_manual.json
|
||||||
source = arch-meson
|
source = arch-meson
|
||||||
source = cross-lib32
|
source = cross-lib32
|
||||||
source = native-clang
|
source = native-clang
|
||||||
source = 0001-Skip-broken-tests.patch
|
source = 0001-Skip-broken-tests.patch
|
||||||
source = 0002-Use-C-17-for-protobuf-tests.patch
|
source = 0002-Limit-unittests-workers.patch
|
||||||
source = 0003-Limit-unittests-workers.patch
|
|
||||||
validpgpkeys = 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70
|
validpgpkeys = 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70
|
||||||
b2sums = 64d53eddc8cb321a4e2dabaa4b7499798a7b68764b1a7a5182bfa21d081dc07105acab616119b88ff610e5d75504f03d1c0aefee3602ddf538fc491ff3d0204a
|
b2sums = 72b061598a0cb22517460de4df25394a9dfbddb536c5b8e75b7267ae21292fe2a6a3ec16d64aa81cde63d33022decebcc051cf2d87d677f9b40eb2f4106a40cd
|
||||||
b2sums = SKIP
|
b2sums = SKIP
|
||||||
b2sums = 95eff6139275ddc826395192e2e7043d665641260454aeda06dca7e573d34b348c2a935ac1603d8d838f480fe6b57ba2ece51fa90760ab3014e15c70f6d130ea
|
b2sums = 692feb16f6ef585e5b7fa46370b0ad0ed0418cf05a15fe08cc5f2945cc83425dda0232e8c30c26b3d82ce95fe1703890b0a53ee7745c78e71a1a8eb8cd376e1c
|
||||||
b2sums = 82f234701f578f5c85d527a95e6026b5d219fde9b212bead51615f38b43c8b0d129a700e792099778802f5b511250a2b56b5074e55709f4aa1ace64ef8949ff8
|
b2sums = 46b62e840f066287c74ac066e03f56b54e9c7fa1e5789dd0c93e112ff4d62194dc5be6ac39c9d17d6242105e078c05e98109aed3c4f0f7c317b549cb9ff54610
|
||||||
b2sums = 70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af
|
b2sums = 70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af
|
||||||
b2sums = 9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081
|
b2sums = 9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081
|
||||||
b2sums = 7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e
|
b2sums = 7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e
|
||||||
b2sums = 21466907b450c662824f576accbf49d4bb543c5d7a1075dfcd48e89db92537d2dbe194a55c335bd520f787125b83b394a9f9f2b9e16d667797dc34c3b862bf60
|
b2sums = ebcd0d961bdc00309aa76e93e49c7136c454d1d1838c6bf5a5b168c0a94532353d32364de16c045f14950dd5313c17f33b3d7974317ba94db161638f93de6845
|
||||||
b2sums = c0154434fefb00aebb66b276c3b871b9ec629adc8f3c5b020a21b4662667c0bdaa2c48c6a7498d0c7ab901bb9c3911bd0bb82fbae5e5f3ae2da006e3849e0ff0
|
|
||||||
b2sums = 5847e2f1bf362c9fdaf522f0d3a6c81e67c7ac8c016e0ade5632bf23c1ea591c3659fe40f2139e97805144b3a6db6fe375977735b6fc74a7c7a6f8e581632f24
|
b2sums = 5847e2f1bf362c9fdaf522f0d3a6c81e67c7ac8c016e0ade5632bf23c1ea591c3659fe40f2139e97805144b3a6db6fe375977735b6fc74a7c7a6f8e581632f24
|
||||||
|
|
||||||
pkgname = meson
|
pkgname = meson
|
||||||
|
|
|
||||||
|
|
@ -10,14 +10,14 @@ Subject: [PATCH] Skip broken tests
|
||||||
3 files changed, 4 insertions(+), 1 deletion(-)
|
3 files changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/test cases/frameworks/15 llvm/test.json b/test cases/frameworks/15 llvm/test.json
|
diff --git a/test cases/frameworks/15 llvm/test.json b/test cases/frameworks/15 llvm/test.json
|
||||||
index f9d730514220..3d70077acd02 100644
|
index cf8aa3acc7bd..3d70077acd02 100644
|
||||||
--- a/test cases/frameworks/15 llvm/test.json
|
--- a/test cases/frameworks/15 llvm/test.json
|
||||||
+++ b/test cases/frameworks/15 llvm/test.json
|
+++ b/test cases/frameworks/15 llvm/test.json
|
||||||
@@ -7,7 +7,6 @@
|
@@ -7,7 +7,6 @@
|
||||||
{ "val": "combination", "skip_on_jobname": ["msys2"] }
|
{ "val": "combination", "skip_on_jobname": ["msys2"] }
|
||||||
],
|
],
|
||||||
"link-static": [
|
"link-static": [
|
||||||
- { "val": true, "skip_on_jobname": ["opensuse"] },
|
- { "val": true, "skip_on_jobname": ["arch", "opensuse", "linux-gentoo-gcc"] },
|
||||||
{ "val": false }
|
{ "val": false }
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
|
||||||
Date: Wed, 12 Jul 2023 00:10:11 +0200
|
|
||||||
Subject: [PATCH] Use C++17 for protobuf tests
|
|
||||||
|
|
||||||
Our protobuf (and abseil-cpp) can currently only be used with C++17.
|
|
||||||
---
|
|
||||||
test cases/frameworks/5 protocol buffers/meson.build | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/test cases/frameworks/5 protocol buffers/meson.build b/test cases/frameworks/5 protocol buffers/meson.build
|
|
||||||
index 9a4154b652f3..f9e677c95f8f 100644
|
|
||||||
--- a/test cases/frameworks/5 protocol buffers/meson.build
|
|
||||||
+++ b/test cases/frameworks/5 protocol buffers/meson.build
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-project('protocol buffer test', 'cpp', default_options: ['cpp_std=c++14'])
|
|
||||||
+project('protocol buffer test', 'cpp', default_options: ['cpp_std=c++17'])
|
|
||||||
|
|
||||||
protoc = find_program('protoc', required : false)
|
|
||||||
dep = dependency('protobuf', required : false)
|
|
||||||
|
|
@ -6,8 +6,8 @@
|
||||||
# - disable lto in arch-meson
|
# - disable lto in arch-meson
|
||||||
|
|
||||||
pkgname=meson
|
pkgname=meson
|
||||||
pkgver=1.3.1
|
pkgver=1.3.2
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
pkgdesc="High productivity build system"
|
pkgdesc="High productivity build system"
|
||||||
url="https://mesonbuild.com/"
|
url="https://mesonbuild.com/"
|
||||||
arch=(any)
|
arch=(any)
|
||||||
|
|
@ -76,18 +76,16 @@ source=(
|
||||||
cross-lib32
|
cross-lib32
|
||||||
native-clang
|
native-clang
|
||||||
0001-Skip-broken-tests.patch
|
0001-Skip-broken-tests.patch
|
||||||
0002-Use-C-17-for-protobuf-tests.patch
|
0002-Limit-unittests-workers.patch
|
||||||
0003-Limit-unittests-workers.patch
|
|
||||||
)
|
)
|
||||||
b2sums=('64d53eddc8cb321a4e2dabaa4b7499798a7b68764b1a7a5182bfa21d081dc07105acab616119b88ff610e5d75504f03d1c0aefee3602ddf538fc491ff3d0204a'
|
b2sums=('72b061598a0cb22517460de4df25394a9dfbddb536c5b8e75b7267ae21292fe2a6a3ec16d64aa81cde63d33022decebcc051cf2d87d677f9b40eb2f4106a40cd'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'95eff6139275ddc826395192e2e7043d665641260454aeda06dca7e573d34b348c2a935ac1603d8d838f480fe6b57ba2ece51fa90760ab3014e15c70f6d130ea'
|
'692feb16f6ef585e5b7fa46370b0ad0ed0418cf05a15fe08cc5f2945cc83425dda0232e8c30c26b3d82ce95fe1703890b0a53ee7745c78e71a1a8eb8cd376e1c'
|
||||||
'82f234701f578f5c85d527a95e6026b5d219fde9b212bead51615f38b43c8b0d129a700e792099778802f5b511250a2b56b5074e55709f4aa1ace64ef8949ff8'
|
'46b62e840f066287c74ac066e03f56b54e9c7fa1e5789dd0c93e112ff4d62194dc5be6ac39c9d17d6242105e078c05e98109aed3c4f0f7c317b549cb9ff54610'
|
||||||
'211cee61f117fd1d582d7a613a8634f044e9e307791c4154c6da72bccd5f06856801b14bcb26157ee682b5935c48ffd2098a5fabab2232726d7758cf091c07f7'
|
'211cee61f117fd1d582d7a613a8634f044e9e307791c4154c6da72bccd5f06856801b14bcb26157ee682b5935c48ffd2098a5fabab2232726d7758cf091c07f7'
|
||||||
'9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081'
|
'9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081'
|
||||||
'7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e'
|
'7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e'
|
||||||
'21466907b450c662824f576accbf49d4bb543c5d7a1075dfcd48e89db92537d2dbe194a55c335bd520f787125b83b394a9f9f2b9e16d667797dc34c3b862bf60'
|
'ebcd0d961bdc00309aa76e93e49c7136c454d1d1838c6bf5a5b168c0a94532353d32364de16c045f14950dd5313c17f33b3d7974317ba94db161638f93de6845'
|
||||||
'c0154434fefb00aebb66b276c3b871b9ec629adc8f3c5b020a21b4662667c0bdaa2c48c6a7498d0c7ab901bb9c3911bd0bb82fbae5e5f3ae2da006e3849e0ff0'
|
|
||||||
'5847e2f1bf362c9fdaf522f0d3a6c81e67c7ac8c016e0ade5632bf23c1ea591c3659fe40f2139e97805144b3a6db6fe375977735b6fc74a7c7a6f8e581632f24')
|
'5847e2f1bf362c9fdaf522f0d3a6c81e67c7ac8c016e0ade5632bf23c1ea591c3659fe40f2139e97805144b3a6db6fe375977735b6fc74a7c7a6f8e581632f24')
|
||||||
validpgpkeys=(
|
validpgpkeys=(
|
||||||
19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen <jpakkane@gmail.com>
|
19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen <jpakkane@gmail.com>
|
||||||
|
|
@ -98,8 +96,7 @@ prepare() {
|
||||||
|
|
||||||
# Pass tests
|
# Pass tests
|
||||||
patch -Np1 -i ../0001-Skip-broken-tests.patch
|
patch -Np1 -i ../0001-Skip-broken-tests.patch
|
||||||
patch -Np1 -i ../0002-Use-C-17-for-protobuf-tests.patch
|
patch -Np1 -i ../0002-Limit-unittests-workers.patch
|
||||||
patch -Np1 -i ../0003-Limit-unittests-workers.patch
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue