initial import
This commit is contained in:
35
gyp/PKGBUILD
Normal file
35
gyp/PKGBUILD
Normal file
@@ -0,0 +1,35 @@
|
||||
# Maintainer: Jesus E. <heckyel@riseup.net>
|
||||
|
||||
pkgname=gyp
|
||||
pkgver=0.1+20200513gitcaa6002
|
||||
pkgrel=4
|
||||
pkgdesc='"Generate Your Projects" Meta-Build system'
|
||||
arch=('any')
|
||||
url='https://gyp.gsrc.io/'
|
||||
license=('Modified-BSD')
|
||||
depends=('python-setuptools' 'ninja')
|
||||
source=("${pkgname}-${pkgver}.tar.gz::https://deb.debian.org/debian/pool/main/g/gyp/gyp_${pkgver}.orig.tar.gz"
|
||||
"gyp-fix-cmake.patch"
|
||||
"gyp-python38.patch")
|
||||
sha512sums=('c6aa49a8df998df3b72e49b1154fc764b5affb1dbedd2b581dd554a7bfbd01c454e9c8ca0536253533e788bb63b2b390bac625d4e4352d9fcb67630acfc564f5'
|
||||
'289eb0f280912f971fed3e76ddf7b6ea784b43eb71c510619a0129d4155c85b915ffdfecb60bc36166684bc6a7a38da8f9d83252b70d3dbb508e57043fb2f5a8'
|
||||
'60f39b9f8f30599f1894eb143869a1cfa03b2ebfa3e163912543f6c457bc6aa544fa03c897b8db5457aecc453e5c997cf2d615ab7320ab56581564f57d8c130e')
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
# Python 3 fixes
|
||||
patch -Np1 -i ${srcdir}/gyp-fix-cmake.patch
|
||||
patch -Np1 -i ${srcdir}/gyp-python38.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
python setup.py build
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
python setup.py install --root="$pkgdir" --optimize=1 --skip-build
|
||||
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE
|
||||
}
|
||||
33
gyp/gyp-fix-cmake.patch
Normal file
33
gyp/gyp-fix-cmake.patch
Normal file
@@ -0,0 +1,33 @@
|
||||
--- a/pylib/gyp/generator/cmake.py
|
||||
+++ b/pylib/gyp/generator/cmake.py
|
||||
@@ -40,9 +40,9 @@
|
||||
|
||||
try:
|
||||
# maketrans moved to str in python3.
|
||||
+ _maketrans = str.maketrans
|
||||
+except AttributeError:
|
||||
_maketrans = string.maketrans
|
||||
-except NameError:
|
||||
- _maketrans = str.maketrans
|
||||
|
||||
generator_default_variables = {
|
||||
'EXECUTABLE_PREFIX': '',
|
||||
@@ -281,7 +281,7 @@
|
||||
dirs = set(dir for dir in (os.path.dirname(o) for o in outputs) if dir)
|
||||
|
||||
if int(action.get('process_outputs_as_sources', False)):
|
||||
- extra_sources.extend(zip(cmake_outputs, outputs))
|
||||
+ extra_sources.extend(list(zip(cmake_outputs, outputs)))
|
||||
|
||||
# add_custom_command
|
||||
output.write('add_custom_command(OUTPUT ')
|
||||
@@ -987,7 +987,7 @@
|
||||
|
||||
# XCode settings
|
||||
xcode_settings = config.get('xcode_settings', {})
|
||||
- for xcode_setting, xcode_value in xcode_settings.viewitems():
|
||||
+ for xcode_setting, xcode_value in xcode_settings.items():
|
||||
SetTargetProperty(output, cmake_target_name,
|
||||
"XCODE_ATTRIBUTE_%s" % xcode_setting, xcode_value,
|
||||
'' if isinstance(xcode_value, str) else ' ')
|
||||
|
||||
63
gyp/gyp-python38.patch
Normal file
63
gyp/gyp-python38.patch
Normal file
@@ -0,0 +1,63 @@
|
||||
commit 7b0a3fd85beb67c990da3fb1b690444a27a6ee42
|
||||
Author: Tom Hughes <tom@compton.nu>
|
||||
Date: Fri Aug 23 09:33:14 2019 +0100
|
||||
|
||||
Fix python 3.8 warnings
|
||||
|
||||
diff --git a/pylib/gyp/input.py b/pylib/gyp/input.py
|
||||
index 42c279cf..013231dc 100644
|
||||
--- a/pylib/gyp/input.py
|
||||
+++ b/pylib/gyp/input.py
|
||||
@@ -1181,7 +1181,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
|
||||
if variable_name in variables:
|
||||
# If the variable is already set, don't set it.
|
||||
continue
|
||||
- if the_dict_key is 'variables' and variable_name in the_dict:
|
||||
+ if the_dict_key == 'variables' and variable_name in the_dict:
|
||||
# If the variable is set without a % in the_dict, and the_dict is a
|
||||
# variables dict (making |variables| a varaibles sub-dict of a
|
||||
# variables dict), use the_dict's definition.
|
||||
diff --git a/test/lib/TestCmd.py b/test/lib/TestCmd.py
|
||||
index 1ec50933..457694c8 100644
|
||||
--- a/test/lib/TestCmd.py
|
||||
+++ b/test/lib/TestCmd.py
|
||||
@@ -283,7 +283,7 @@ if os.name in ('posix', 'nt'):
|
||||
else:
|
||||
tempfile.template = 'testcmd.'
|
||||
|
||||
-re_space = re.compile('\s')
|
||||
+re_space = re.compile(r'\s')
|
||||
|
||||
_Cleanup = []
|
||||
|
||||
@@ -882,7 +882,7 @@ class TestCmd(object):
|
||||
#self.diff_function = difflib.unified_diff
|
||||
self._dirlist = []
|
||||
self._preserve = {'pass_test': 0, 'fail_test': 0, 'no_result': 0}
|
||||
- if 'PRESERVE' in os.environ and os.environ['PRESERVE'] is not '':
|
||||
+ if 'PRESERVE' in os.environ and os.environ['PRESERVE'] != '':
|
||||
self._preserve['pass_test'] = os.environ['PRESERVE']
|
||||
self._preserve['fail_test'] = os.environ['PRESERVE']
|
||||
self._preserve['no_result'] = os.environ['PRESERVE']
|
||||
@@ -1103,7 +1103,7 @@ class TestCmd(object):
|
||||
the temporary working directories to be preserved for all
|
||||
conditions.
|
||||
"""
|
||||
- if conditions is ():
|
||||
+ if len(conditions) == 0:
|
||||
conditions = ('pass_test', 'fail_test', 'no_result')
|
||||
for cond in conditions:
|
||||
self._preserve[cond] = 1
|
||||
diff --git a/test/lib/TestGyp.py b/test/lib/TestGyp.py
|
||||
index cba2d3cc..43865ee1 100644
|
||||
--- a/test/lib/TestGyp.py
|
||||
+++ b/test/lib/TestGyp.py
|
||||
@@ -742,7 +742,7 @@ def FindVisualStudioInstallation():
|
||||
build_tool = None
|
||||
if not build_tool:
|
||||
args1 = ['reg', 'query',
|
||||
- 'HKLM\Software\Microsoft\VisualStudio\SxS\VS7',
|
||||
+ r'HKLM\Software\Microsoft\VisualStudio\SxS\VS7',
|
||||
'/v', '15.0', '/reg:32']
|
||||
build_tool = subprocess.check_output(args1).decode(
|
||||
'utf-8', 'ignore').strip().split(b'\r\n').pop().split(b' ').pop()
|
||||
Reference in New Issue
Block a user