Skip to content

Commit b2b0dd7

Browse files
author
taca
committed
devel/gyp: fix a few problems
* Remove git repository since it bad interaction when git is installed. fatal: detected dubious ownership in repository at "$WRKSRC/default/gyp" * Remove warnings at install stage. => Generating pre-install file lists /usr/pkg/lib/python3.13/site-packages/gyp/input.py:1186: SyntaxWarning: "is" with 'str' literal. Did you mean "=="? /usr/pkg/lib/python3.13/site-packages/gyp/input.py:1186: SyntaxWarning: "is" with 'str' literal. Did you mean "=="? Bump PKGREVISION.
1 parent 421958e commit b2b0dd7

3 files changed

Lines changed: 22 additions & 2 deletions

File tree

devel/gyp/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
# $NetBSD: Makefile,v 1.30 2026/02/04 00:06:54 wiz Exp $
1+
# $NetBSD: Makefile,v 1.31 2026/07/04 06:39:26 taca Exp $
22

33
GIT_VERSION= 20240206.1615ec326858f8c2bd8f30b3a86ea71830409ce4
44
DIST_VERSION= 0.1
5+
PKGREVISION= 1
56
DISTNAME= gyp-${DIST_VERSION}pre${GIT_VERSION}
67
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:C/.[^.]*$//}
78
CATEGORIES= devel
@@ -40,6 +41,9 @@ USE_TOOLS+= bash:run
4041
USE_TOOLS+= gmake
4142
USE_LANGUAGES= c c++
4243

44+
pre-configure:
45+
cd ${WRKSRC}; rm -fr .git
46+
4347
do-test:
4448
${RUN}cd ${WRKSRC}; LANG=C ${SETENV} ${TEST_ENV} ${PYTHONBIN} gyptest.py -a -f make --passed
4549

devel/gyp/distinfo

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
$NetBSD: distinfo,v 1.15 2026/02/04 00:06:54 wiz Exp $
1+
$NetBSD: distinfo,v 1.16 2026/07/04 06:39:26 taca Exp $
22

33
BLAKE2s (gyp-0.1pre20240206.1615ec326858f8c2bd8f30b3a86ea71830409ce4.tar.gz) = aded0d09e94f3ea4002f9a6b4e9784bb2961e096bd68a444f7fc84dc3c9c0c85
44
SHA512 (gyp-0.1pre20240206.1615ec326858f8c2bd8f30b3a86ea71830409ce4.tar.gz) = df55eaf8d62f8e847673cb8ef40d502673847abbfa45567f2edb531f9a1135f832f13c8cecd8fcfbbbd8a2489463678f4b629aad7744e6afaf423ed5a8746988
55
Size (gyp-0.1pre20240206.1615ec326858f8c2bd8f30b3a86ea71830409ce4.tar.gz) = 13327419 bytes
66
SHA1 (patch-gyptest.py) = b5580c82be8f93b50bfc66e094ae092bf8571202
77
SHA1 (patch-pylib_gyp_common.py) = 161ceeed274a95908d678a01a80e31918b6c7ac3
88
SHA1 (patch-pylib_gyp_generator_make.py) = 1feb43b650a4dd8514e74e0c2bda41bde2243e03
9+
SHA1 (patch-pylib_gyp_input.py) = 25b3aeab9feda0c42f218ad314fa4bc9af4dba79
910
SHA1 (patch-test_library__dirs_subdir_test.gyp) = 9eb3b39f0bdbf54df6b45a3c613d83e9dfb68d8f
1011
SHA1 (patch-test_module_src_module.gyp) = 8016db83cce1244f17295d3dfd725f75ff78cb28
1112
SHA1 (patch-test_module_src_program.c) = 90850bbf561d70948f798c385b051df8b1b994b1
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
$NetBSD: patch-pylib_gyp_input.py,v 1.1 2026/07/04 06:39:26 taca Exp $
2+
3+
Stop SyntaxWarning: "is" with 'str' literal.
4+
5+
--- pylib/gyp/input.py.orig 2026-02-04 00:01:38.000000000 +0000
6+
+++ pylib/gyp/input.py
7+
@@ -1183,7 +1183,7 @@ def LoadVariablesFromVariablesDict(varia
8+
if variable_name in variables:
9+
# If the variable is already set, don't set it.
10+
continue
11+
- if the_dict_key is 'variables' and variable_name in the_dict:
12+
+ if the_dict_key == 'variables' and variable_name in the_dict:
13+
# If the variable is set without a % in the_dict, and the_dict is a
14+
# variables dict (making |variables| a varaibles sub-dict of a
15+
# variables dict), use the_dict's definition.

0 commit comments

Comments
 (0)