meson: fix static intl dep
This commit is contained in:
parent
b3b001eec0
commit
f9b5301bec
29
meson/9722.patch
Normal file
29
meson/9722.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From cb727df508fe733a7b0937634674ffe8f4fcba06 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
||||||
|
Date: Sun, 12 Dec 2021 10:21:02 +0100
|
||||||
|
Subject: [PATCH] intl dep: forward static to iconv if needed
|
||||||
|
|
||||||
|
In 1fb6c939473ca7cdab2 the intl dep gained support for static linking
|
||||||
|
which also forwarded this property to the iconv sub dependency.
|
||||||
|
|
||||||
|
The refactoring in 214d03568f75 lost this change, which results in
|
||||||
|
iconv getting linked dynamically again.
|
||||||
|
|
||||||
|
Forward static again to fix this.
|
||||||
|
---
|
||||||
|
mesonbuild/dependencies/misc.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
|
||||||
|
index e490e7dee59..470305e91a7 100644
|
||||||
|
--- a/mesonbuild/dependencies/misc.py
|
||||||
|
+++ b/mesonbuild/dependencies/misc.py
|
||||||
|
@@ -487,7 +487,7 @@ def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]):
|
||||||
|
self.is_found = True
|
||||||
|
|
||||||
|
if self.static:
|
||||||
|
- if not self._add_sub_dependency(iconv_factory(env, self.for_machine, {})):
|
||||||
|
+ if not self._add_sub_dependency(iconv_factory(env, self.for_machine, {'static': True})):
|
||||||
|
self.is_found = False
|
||||||
|
return
|
||||||
|
|
||||||
@ -2,22 +2,26 @@
|
|||||||
|
|
||||||
pkgname=meson
|
pkgname=meson
|
||||||
pkgver=0.60.2
|
pkgver=0.60.2
|
||||||
pkgrel=2
|
pkgrel=3
|
||||||
pkgdesc='High-productivity build system'
|
pkgdesc='High-productivity build system'
|
||||||
arch=('any')
|
arch=('any')
|
||||||
url="https://mesonbuild.com/"
|
url="https://mesonbuild.com/"
|
||||||
license=('Apache 2')
|
license=('Apache 2')
|
||||||
depends=('python' 'python-setuptools' 'ninja')
|
depends=('python' 'python-setuptools' 'ninja')
|
||||||
source=("https://github.com/mesonbuild/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc}
|
source=("https://github.com/mesonbuild/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc}
|
||||||
"0001-cygwin-disguise.patch")
|
"0001-cygwin-disguise.patch"
|
||||||
|
"9722.patch")
|
||||||
sha256sums=('64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921'
|
sha256sums=('64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'e975a4416cb8c23521e702cef04cd60399728f6a7346da396cda6989d8b699b8')
|
'e975a4416cb8c23521e702cef04cd60399728f6a7346da396cda6989d8b699b8'
|
||||||
|
'b86a7c532ce8f453d7190a54292ac83c7b7c287a6f1f50aaf4bb310394fa52d2')
|
||||||
validpgpkeys=("19E2D6D9B46D8DAA6288F877C24E631BABB1FE70") # Jussi Pakkanen <jpakkane@gmail.com>
|
validpgpkeys=("19E2D6D9B46D8DAA6288F877C24E631BABB1FE70") # Jussi Pakkanen <jpakkane@gmail.com>
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
patch -p1 -i "${srcdir}"/0001-cygwin-disguise.patch
|
patch -p1 -i "${srcdir}"/0001-cygwin-disguise.patch
|
||||||
|
# https://github.com/mesonbuild/meson/pull/9722
|
||||||
|
patch -p1 -i "${srcdir}"/9722.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user