update to newer gyp checkout, switch to py3

This commit is contained in:
sthen 2021-02-27 21:09:36 +00:00
parent c83f9ceaab
commit afcd46a1bc
5 changed files with 84 additions and 50 deletions

View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.9 2021/02/23 19:39:15 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2021/02/27 21:09:36 sthen Exp $
COMMENT= generate SCons/Makefiles from platform-independent input
DISTNAME= gyp-r1812
REVISION= 2
PKGNAME= ${DISTNAME:S/r/0./g}
GH_ACCOUNT= chromium
GH_PROJECT= gyp
GH_COMMIT= caa60026e223fc501e8b337fd5086ece4028b1c6
DISTNAME= gyp-0.20200512
CATEGORIES= devel
@ -13,14 +15,15 @@ HOMEPAGE= https://bugs.chromium.org/p/gyp/
# BSD
PERMIT_PACKAGE= Yes
MASTER_SITES= http://deftly.net/
MODULES= lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
MODPY_SETUPTOOLS= Yes
TEST_DEPENDS= devel/ninja
NO_CCACHE= Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/gyp
NO_TEST= Yes
do-test:
ln -fs ${MODPY_BIN} ${WRKDIR}/bin/python
cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MODPY_BIN} gyptest.py -a
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (gyp-r1812.tar.gz) = Ofrm40joLlo/7LnQuIQL0efKg5Z9vt5UG5sB3vum7IQ=
SIZE (gyp-r1812.tar.gz) = 536890
SHA256 (gyp-0.20200512-caa60026.tar.gz) = m0Q8V6tBZv0JhEzn2R0ePQtMcFEoXWZApvT9D6jZNvQ=
SIZE (gyp-0.20200512-caa60026.tar.gz) = 630532

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-gyp,v 1.1 2021/02/27 21:09:36 sthen Exp $
Index: gyp
--- gyp.orig
+++ gyp
@@ -5,4 +5,4 @@
set -e
base=$(dirname "$0")
-exec python "${base}/gyp_main.py" "$@"
+exec ${MODPY_BIN} "${base}/gyp_main.py" "$@"

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-gyptest_py,v 1.3 2021/02/27 21:09:36 sthen Exp $
Index: gyptest.py
--- gyptest.py.orig
+++ gyptest.py
@@ -99,6 +99,8 @@ def main(argv=None):
'freebsd7': ['make'],
'freebsd8': ['make'],
'openbsd5': ['make'],
+ 'openbsd6': ['ninja'],
+ 'openbsd7': ['ninja'],
'cygwin': ['msvs'],
'win32': ['msvs', 'ninja'],
'linux': ['make', 'ninja'],

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2014/01/20 19:40:02 abieber Exp $
@comment $OpenBSD: PLIST,v 1.3 2021/02/27 21:09:36 sthen Exp $
bin/gyp
lib/python${MODPY_VERSION}/site-packages/gyp/
lib/python${MODPY_VERSION}/site-packages/gyp-0.1-py${MODPY_VERSION}.egg-info/
@ -8,77 +8,83 @@ lib/python${MODPY_VERSION}/site-packages/gyp-0.1-py${MODPY_VERSION}.egg-info/dep
lib/python${MODPY_VERSION}/site-packages/gyp-0.1-py${MODPY_VERSION}.egg-info/entry_points.txt
lib/python${MODPY_VERSION}/site-packages/gyp-0.1-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSNew.py
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSNew.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSProject.py
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSProject.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSSettings.py
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSSettings.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSSettings_test.py
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSSettings_test.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSToolFile.py
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSToolFile.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSUserFile.py
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSUserFile.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSUtil.py
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSUtil.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSVersion.py
lib/python${MODPY_VERSION}/site-packages/gyp/MSVSVersion.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/__init__.py
lib/python${MODPY_VERSION}/site-packages/gyp/__init__.pyc
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSNew.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSProject.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSSettings.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSSettings_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSToolFile.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSUserFile.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSUtil.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}MSVSVersion.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}common_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}easy_xml.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}easy_xml_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}flock_tool.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}input.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}input_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}mac_tool.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}msvs_emulation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}ninja_syntax.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}simple_copy.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}win_tool.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}xcode_emulation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}xcode_ninja.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}xcodeproj_file.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/${MODPY_PYCACHE}xml_fix.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/common.py
lib/python${MODPY_VERSION}/site-packages/gyp/common.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/common_test.py
lib/python${MODPY_VERSION}/site-packages/gyp/common_test.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/easy_xml.py
lib/python${MODPY_VERSION}/site-packages/gyp/easy_xml.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/easy_xml_test.py
lib/python${MODPY_VERSION}/site-packages/gyp/easy_xml_test.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/flock_tool.py
lib/python${MODPY_VERSION}/site-packages/gyp/flock_tool.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/
lib/python${MODPY_VERSION}/site-packages/gyp/generator/__init__.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/android.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/android.pyc
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}analyzer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}cmake.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}dump_dependency_json.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}eclipse.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}gypd.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}gypsh.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}make.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}msvs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}msvs_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}ninja.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}ninja_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}xcode.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/${MODPY_PYCACHE}xcode_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/analyzer.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/cmake.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/cmake.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/dump_dependency_json.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/dump_dependency_json.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/eclipse.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/eclipse.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/gypd.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/gypd.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/gypsh.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/gypsh.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/make.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/make.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/msvs.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/msvs.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/msvs_test.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/msvs_test.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/ninja.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/ninja.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/ninja_test.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/ninja_test.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/xcode.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/xcode.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/generator/xcode_test.py
lib/python${MODPY_VERSION}/site-packages/gyp/generator/xcode_test.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/input.py
lib/python${MODPY_VERSION}/site-packages/gyp/input.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/input_test.py
lib/python${MODPY_VERSION}/site-packages/gyp/input_test.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/mac_tool.py
lib/python${MODPY_VERSION}/site-packages/gyp/mac_tool.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/msvs_emulation.py
lib/python${MODPY_VERSION}/site-packages/gyp/msvs_emulation.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/ninja_syntax.py
lib/python${MODPY_VERSION}/site-packages/gyp/ninja_syntax.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/simple_copy.py
lib/python${MODPY_VERSION}/site-packages/gyp/win_tool.py
lib/python${MODPY_VERSION}/site-packages/gyp/win_tool.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/xcode_emulation.py
lib/python${MODPY_VERSION}/site-packages/gyp/xcode_emulation.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/xcode_ninja.py
lib/python${MODPY_VERSION}/site-packages/gyp/xcodeproj_file.py
lib/python${MODPY_VERSION}/site-packages/gyp/xcodeproj_file.pyc
lib/python${MODPY_VERSION}/site-packages/gyp/xml_fix.py
lib/python${MODPY_VERSION}/site-packages/gyp/xml_fix.pyc