mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: building node modules with Visual Studio 2017 (#34109)

Browse source
This commit is contained in:
Milan Burda 2022-05-10 23:26:07 +02:00 committed by GitHub
parent 627c2987ba
commit e76cf3e2ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/v8/.patches
View file

@ -4,6 +4,6 @@ dcheck.patch
export_symbols_needed_for_windows_build.patch export_symbols_needed_for_windows_build.patch
workaround_an_undefined_symbol_error.patch workaround_an_undefined_symbol_error.patch
do_not_export_private_v8_symbols_on_windows.patch do_not_export_private_v8_symbols_on_windows.patch
fix_build_deprecated_attirbute_for_older_msvc_versions.patch fix_build_deprecated_attribute_for_older_msvc_versions.patch
fix_disable_implies_dcheck_for_node_stream_array_buffers.patch fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch revert_fix_cppgc_removed_deleted_cstors_in_cppheapcreateparams.patch

13
patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch → patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch
View file

@ -1,15 +1,12 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Deepak Mohan <hop2deep@gmail.com> From: Deepak Mohan <hop2deep@gmail.com>
Date: Tue, 28 Jan 2020 15:48:03 -0800 Date: Tue, 28 Jan 2020 15:48:03 -0800
Subject: fix: usage of c++ [[deprecated]] attirbute for older msvc versions Subject: fix: usage of c++ [[deprecated]] attribute for older msvc versions
VS 2015 update 3 has a bug where [[deprecated]] attribute cannot This attribute can only be used in all contexts in Visual Studio 2019
be applied to constructor declarations, this is fixed in 2017 and
higher versions, but native module compiling with this version
will have an issue.
diff --git a/include/v8config.h b/include/v8config.h diff --git a/include/v8config.h b/include/v8config.h
index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..010b3633546601ba70a55aeb8e8fc503ef79e2f5 100644 index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..d203053d41c702733f5f3b950aa31cef74c2ab57 100644
--- a/include/v8config.h --- a/include/v8config.h
+++ b/include/v8config.h +++ b/include/v8config.h
@@ -454,10 +454,13 @@ path. Add it with -I<path> to the command line @@ -454,10 +454,13 @@ path. Add it with -I<path> to the command line
@ -20,7 +17,7 @@ index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..010b3633546601ba70a55aeb8e8fc503
// A macro (V8_DEPRECATED) to mark classes or functions as deprecated. // A macro (V8_DEPRECATED) to mark classes or functions as deprecated.
#if defined(V8_DEPRECATION_WARNINGS) #if defined(V8_DEPRECATION_WARNINGS)
-# define V8_DEPRECATED(message) [[deprecated(message)]] -# define V8_DEPRECATED(message) [[deprecated(message)]]
+# if defined(_MSC_VER) && _MSC_VER <= 1900 +# if !defined(__clang__) && defined(_MSC_VER) && _MSC_VER < 1920
+# define V8_DEPRECATED(message) __declspec(deprecated(message)) +# define V8_DEPRECATED(message) __declspec(deprecated(message))
+# else +# else
+# define V8_DEPRECATED(message) [[deprecated(message)]] +# define V8_DEPRECATED(message) [[deprecated(message)]]
@ -33,7 +30,7 @@ index 77fd65c6c5b7d8c0a7fe7a37c40e17ce66f49ce6..010b3633546601ba70a55aeb8e8fc503
// A macro (V8_DEPRECATE_SOON) to make it easier to see what will be deprecated. // A macro (V8_DEPRECATE_SOON) to make it easier to see what will be deprecated.
#if defined(V8_IMMINENT_DEPRECATION_WARNINGS) #if defined(V8_IMMINENT_DEPRECATION_WARNINGS)
-# define V8_DEPRECATE_SOON(message) [[deprecated(message)]] -# define V8_DEPRECATE_SOON(message) [[deprecated(message)]]
+# if defined(_MSC_VER) && _MSC_VER <= 1900 +# if !defined(__clang__) && defined(_MSC_VER) && _MSC_VER < 1920
+# define V8_DEPRECATE_SOON(message) __declspec(deprecated(message)) +# define V8_DEPRECATE_SOON(message) __declspec(deprecated(message))
+# else +# else
+# define V8_DEPRECATE_SOON(message) [[deprecated(message)]] +# define V8_DEPRECATE_SOON(message) [[deprecated(message)]]