Skip to content

Fix issue 8049 #8050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix issue 8049 #8050

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
883dc20
fix(build): use gyp variable for python
ayushmanchhabra Apr 2, 2023
d82955d
Merge branch 'nwjs:nw75' into build-linux
ayushmanchhabra Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions patch/patches/icu.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
diff --git a/icu.gyp b/icu.gyp
index b3c12030..799dce2a 100644
--- icu.gyp
+++ icu.gyp
@@ -25,6 +25,7 @@
index 7deb43c..e2ac65b 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -10,6 +10,7 @@
'use_system_icu%': 0,
'icu_use_data_file_flag%': 0,
'want_separate_host_toolset%': 1,
+ 'python%': 'python3'
},
'target_defaults': {
'direct_dependent_settings': {
@@ -25,6 +26,7 @@
'defines': [
'U_USING_ICU_NAMESPACE=0',
'HAVE_DLOPEN=0',
+ '_LIBCPP_ABI_NAMESPACE=__1',
# Only build encoding coverters and detectors necessary for HTML5.
'UCONFIG_ONLY_HTML_CONVERSION=1',
# TODO(jshin): Do we still need/want this?
@@ -40,8 +41,18 @@
@@ -40,8 +42,18 @@
],
}],
['OS=="win"', {
Expand All @@ -29,3 +37,15 @@ index b3c12030..799dce2a 100644
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
(target_arch=="arm" or target_arch=="ia32" or \
@@ -171,9 +183,9 @@
[ 'OS == "mac" or OS == "ios" or '
'((OS == "android" or OS == "qnx") and '
'_toolset == "host" and host_os == "mac")', {
- 'action': ['python', '<@(_inputs)', '<@(_outputs)', '--mac'],
+ 'action': ['<(python)', '<@(_inputs)', '<@(_outputs)', '--mac'],
} , {
- 'action': ['python', '<@(_inputs)', '<@(_outputs)'],
+ 'action': ['<(python)', '<@(_inputs)', '<@(_outputs)'],
}],
],
},