meson: bump ver and fix darwin assumption
This commit is contained in:
parent
70132cdae8
commit
2dfa59a423
2 changed files with 23 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
|||
pkgver=0.56.2
|
||||
pkgver=0.58.0
|
||||
pkgname=meson
|
||||
deps=python
|
||||
bad=""
|
||||
|
@ -7,6 +7,9 @@ ext="doc"
|
|||
fetch() {
|
||||
curl -L "https://github.com/mesonbuild/meson/releases/download/$pkgver/meson-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
|
||||
tar -xf $pkgname-$pkgver.tar.gz
|
||||
cp ../not-darwin.patch .
|
||||
cd $pkgname-$pkgver
|
||||
patch -p1 < ../not-darwin.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
19
pkgs/meson/not-darwin.patch
Normal file
19
pkgs/meson/not-darwin.patch
Normal file
|
@ -0,0 +1,19 @@
|
|||
--- a/mesonbuild/scripts/depfixer.py
|
||||
+++ b/mesonbuild/scripts/depfixer.py
|
||||
@@ -16,6 +16,7 @@
|
||||
import sys, struct
|
||||
import shutil, subprocess
|
||||
import typing as T
|
||||
+import platform
|
||||
|
||||
from ..mesonlib import OrderedSet
|
||||
|
||||
@@ -478,7 +479,7 @@
|
||||
# https://github.com/mesonbuild/meson/pull/6612#discussion_r378581401
|
||||
if INSTALL_NAME_TOOL is False:
|
||||
INSTALL_NAME_TOOL = bool(shutil.which('install_name_tool'))
|
||||
- if INSTALL_NAME_TOOL:
|
||||
+ if INSTALL_NAME_TOOL and platform.system() == "Darwin":
|
||||
if isinstance(new_rpath, bytes):
|
||||
new_rpath = new_rpath.decode('utf8')
|
||||
fix_darwin(fname, new_rpath, final_path, install_name_mappings)
|
Loading…
Reference in a new issue