meson: Fix yelp helper when install file and symlink fallback

This commit is contained in:
Alexey Pavlov
2019-06-02 14:30:34 +03:00
parent fc42c9fd56
commit 2b9491754f
2 changed files with 14 additions and 1 deletions

View File

@@ -0,0 +1,10 @@
--- meson-0.50.1/mesonbuild/scripts/yelphelper.py.orig 2019-06-02 14:12:32.194759700 +0300
+++ meson-0.50.1/mesonbuild/scripts/yelphelper.py 2019-06-02 14:20:29.403054400 +0300
@@ -90,6 +90,7 @@
os.symlink(srcfile, outfile)
continue
except (NotImplementedError, OSError):
+ infile = srcfile
mlog.warning('Symlinking not supported, falling back to copying')
else:
# Lang doesn't have media file so copy it over 'C' one

View File

@@ -4,7 +4,7 @@ _realname=meson
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.50.1
pkgrel=2
pkgrel=3
pkgdesc="High-productivity build system (mingw-w64)"
arch=('any')
url="http://mesonbuild.com/"
@@ -17,12 +17,14 @@ source=("https://github.com/mesonbuild/${_realname}/releases/download/${pkgver}/
'color-term.patch'
'0002-Default-to-sys.prefix-as-the-default-prefix.patch'
'0003-Strip-the-prefix-from-all-paths-when-installing-with.patch'
'0004-fix-copying-file-when-fallback-from-symlink.patch'
'install-man.patch'
'0001-hacky-fix-for-splitting-paths-in-get_compiler_dirs.patch')
sha256sums=('f68f56d60c80a77df8fc08fa1016bc5831605d4717b622c96212573271e14ecc'
'5805aed0a117536eb16dd8eef978c6be57c2471b655ede63e25517c28b4f4cf0'
'4ef1e6fb0e9bd927b4646e416631b8a0a9aece763d259dbba58168bcba93f673'
'2093c617cf3146a4cea601e7c73400d8ec5fd52ac5cf642c4f5af2d6493b1cb1'
'c95ecab95aba294e5e37f5b849d6d07769f9150db968b0c9320dc2d1b93e87a4'
'0682a36cb75e545a78b81293303835a16171f25baf949905dc08029436efff84'
'6c19a8e03df1fc24e12799c456675abd3bf8a0be3e80c0f7b49db0c32e5ae318')
@@ -32,6 +34,7 @@ prepare() {
patch -Np1 -i "${srcdir}"/color-term.patch
patch -Np1 -i "${srcdir}"/0002-Default-to-sys.prefix-as-the-default-prefix.patch
patch -Np1 -i "${srcdir}"/0003-Strip-the-prefix-from-all-paths-when-installing-with.patch
patch -Np1 -i "${srcdir}"/0004-fix-copying-file-when-fallback-from-symlink.patch
patch -Np1 -i "${srcdir}"/install-man.patch
# https://github.com/mesonbuild/meson/issues/5386
patch -Np1 -i "${srcdir}"/0001-hacky-fix-for-splitting-paths-in-get_compiler_dirs.patch