Merge pull request #2448 from lazka/gyp-pin

gyp: fix patch; pin commit
This commit is contained in:
Christoph Reiter 2021-04-17 10:32:46 +02:00 committed by GitHub
commit f2022f2ffc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 13 deletions

View File

@ -82,7 +82,7 @@ index a1e1db5..ca60f58 100644
"""Returns |params.flavor| if it's set, the system's default flavor else.""" """Returns |params.flavor| if it's set, the system's default flavor else."""
flavors = { flavors = {
'cygwin': 'win', 'cygwin': 'win',
+ 'msys': 'win', + 'msys': 'win',
'win32': 'win', 'win32': 'win',
'darwin': 'mac', 'darwin': 'mac',
} }
@ -95,10 +95,10 @@ index e80ebae..e1907a0 100644
target_ext = '.a' target_ext = '.a'
else: else:
- target_ext = '.so' - target_ext = '.so'
+ if self.flavor == 'win': + if self.flavor == 'win':
+ target_ext = '.dll' + target_ext = '.dll'
+ else: + else:
+ target_ext = '.so' + target_ext = '.so'
elif self.type == 'none': elif self.type == 'none':
target = '%s.stamp' % target target = '%s.stamp' % target
elif self.type != 'executable': elif self.type != 'executable':

View File

@ -3,8 +3,8 @@
_realname=gyp _realname=gyp
pkgname=${_realname}-git pkgname=${_realname}-git
pkgver=r2162.28b55023 pkgver=r2163.caa60026
pkgrel=2 pkgrel=1
pkgdesc="GYP can Generate Your Projects" pkgdesc="GYP can Generate Your Projects"
url="https://code.google.com/p/gyp/" url="https://code.google.com/p/gyp/"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
@ -14,22 +14,20 @@ replaces=("gyp-svn")
makedepends=('git') makedepends=('git')
depends=('python' 'python-setuptools') depends=('python' 'python-setuptools')
license=('custom') license=('custom')
source=("git+https://chromium.googlesource.com/external/gyp" _commit="caa60026e223fc501e8b337fd5086ece4028b1c6"
source=("git+https://chromium.googlesource.com/external/gyp#commit=${_commit}"
'0001-msys-ize.patch') '0001-msys-ize.patch')
sha256sums=('SKIP' sha256sums=('SKIP'
'47629f3e86a163c366d4e7494b94f544a70973ec7c4bdbe0dcdd2246660693ce') 'df62802ca323c257b5523437cd2229e432d87d87fc0bf8eeb626eeb5d43f1421')
pkgver() { pkgver() {
cd "${srcdir}"/${_realname} cd "${srcdir}"/${_realname}
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short "${_commit}")"
} }
prepare() { prepare() {
cd "${srcdir}"/${_realname} cd "${srcdir}"/${_realname}
git am --committer-date-is-author-date "${srcdir}"/0001-msys-ize.patch git am --committer-date-is-author-date "${srcdir}"/0001-msys-ize.patch
#https://codereview.chromium.org/2019133002/
#patch -p1 -i "${srcdir}"/issue2019133002_1.diff
} }
package() { package() {