Skip to content
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

deps: exclude linker scripts for windows builds #42973

Closed
wants to merge 2 commits into from
Closed

deps: exclude linker scripts for windows builds #42973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ecf3c4
deps: exclude linker scripts for windows builds
danbev May 5, 2022
4eb4d0e
deps: regenerate OpenSSL archs files
danbev May 16, 2022
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
26 changes: 13 additions & 13 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ our %config = (
"openssldir" => "",
"options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
"patch" => "3",
"perl_archname" => "x86_64-linux-gnu-thread-multi",
"perl_archname" => "x86_64-linux-thread-multi",
"perl_cmd" => "/usr/bin/perl",
"perl_version" => "5.30.0",
"perl_version" => "5.34.1",
"perlargv" => [
"no-comp",
"no-shared",
Expand Down Expand Up @@ -8039,6 +8039,9 @@ our %unified_info = (
},
"apps/lib" => {
"deps" => [
"apps/lib/openssl-bin-cmp_mock_srv.o",
"apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
"apps/lib/uitest-bin-apps_ui.o",
"apps/lib/libapps-lib-app_libctx.o",
"apps/lib/libapps-lib-app_params.o",
"apps/lib/libapps-lib-app_provider.o",
Expand All @@ -8056,10 +8059,7 @@ our %unified_info = (
"apps/lib/libapps-lib-s_cb.o",
"apps/lib/libapps-lib-s_socket.o",
"apps/lib/libapps-lib-tlssrp_depr.o",
"apps/lib/libtestutil-lib-opt.o",
"apps/lib/openssl-bin-cmp_mock_srv.o",
"apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
"apps/lib/uitest-bin-apps_ui.o"
"apps/lib/libtestutil-lib-opt.o"
],
"products" => {
"bin" => [
Expand Down Expand Up @@ -9760,10 +9760,10 @@ our %unified_info = (
},
"providers/fips" => {
"deps" => [
"providers/fips/fips-dso-fips_entry.o",
"providers/fips/libfips-lib-fipsprov.o",
"providers/fips/libfips-lib-self_test.o",
"providers/fips/libfips-lib-self_test_kats.o",
"providers/fips/fips-dso-fips_entry.o"
"providers/fips/libfips-lib-self_test_kats.o"
],
"products" => {
"dso" => [
Expand Down Expand Up @@ -27339,8 +27339,8 @@ unless (caller) {
use File::Copy;
use Pod::Usage;

use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/rafaelgss/repos/os/node/deps/openssl/openssl/external/perl/MODULES.txt';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';

my $here = dirname($0);

Expand All @@ -27367,7 +27367,7 @@ unless (caller) {
);

use lib '.';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use gentemplate;

print 'Creating ',$buildfile_template,"\n";
Expand All @@ -27384,8 +27384,8 @@ unless (caller) {

my $prepend = <<'_____';
use File::Spec::Functions;
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use lib '.';
use platform;
_____
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Mon May 9 17:35:57 2022 UTC"
#define DATE "built on: Mon May 16 03:44:42 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
14 changes: 7 additions & 7 deletions deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ our %config = (
"openssldir" => "",
"options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
"patch" => "3",
"perl_archname" => "x86_64-linux-gnu-thread-multi",
"perl_archname" => "x86_64-linux-thread-multi",
"perl_cmd" => "/usr/bin/perl",
"perl_version" => "5.30.0",
"perl_version" => "5.34.1",
"perlargv" => [
"no-comp",
"no-shared",
Expand Down Expand Up @@ -27339,8 +27339,8 @@ unless (caller) {
use File::Copy;
use Pod::Usage;

use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/rafaelgss/repos/os/node/deps/openssl/openssl/external/perl/MODULES.txt';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';

my $here = dirname($0);

Expand All @@ -27367,7 +27367,7 @@ unless (caller) {
);

use lib '.';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use gentemplate;

print 'Creating ',$buildfile_template,"\n";
Expand All @@ -27384,8 +27384,8 @@ unless (caller) {

my $prepend = <<'_____';
use File::Spec::Functions;
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use lib '.';
use platform;
_____
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Mon May 9 17:36:06 2022 UTC"
#define DATE "built on: Mon May 16 03:44:57 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
26 changes: 13 additions & 13 deletions deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ our %config = (
"openssldir" => "",
"options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
"patch" => "3",
"perl_archname" => "x86_64-linux-gnu-thread-multi",
"perl_archname" => "x86_64-linux-thread-multi",
"perl_cmd" => "/usr/bin/perl",
"perl_version" => "5.30.0",
"perl_version" => "5.34.1",
"perlargv" => [
"no-comp",
"no-shared",
Expand Down Expand Up @@ -7982,6 +7982,9 @@ our %unified_info = (
},
"apps/lib" => {
"deps" => [
"apps/lib/openssl-bin-cmp_mock_srv.o",
"apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
"apps/lib/uitest-bin-apps_ui.o",
"apps/lib/libapps-lib-app_libctx.o",
"apps/lib/libapps-lib-app_params.o",
"apps/lib/libapps-lib-app_provider.o",
Expand All @@ -7999,10 +8002,7 @@ our %unified_info = (
"apps/lib/libapps-lib-s_cb.o",
"apps/lib/libapps-lib-s_socket.o",
"apps/lib/libapps-lib-tlssrp_depr.o",
"apps/lib/libtestutil-lib-opt.o",
"apps/lib/openssl-bin-cmp_mock_srv.o",
"apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
"apps/lib/uitest-bin-apps_ui.o"
"apps/lib/libtestutil-lib-opt.o"
],
"products" => {
"bin" => [
Expand Down Expand Up @@ -9677,10 +9677,10 @@ our %unified_info = (
},
"providers/fips" => {
"deps" => [
"providers/fips/fips-dso-fips_entry.o",
"providers/fips/libfips-lib-fipsprov.o",
"providers/fips/libfips-lib-self_test.o",
"providers/fips/libfips-lib-self_test_kats.o",
"providers/fips/fips-dso-fips_entry.o"
"providers/fips/libfips-lib-self_test_kats.o"
],
"products" => {
"dso" => [
Expand Down Expand Up @@ -27155,8 +27155,8 @@ unless (caller) {
use File::Copy;
use Pod::Usage;

use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/rafaelgss/repos/os/node/deps/openssl/openssl/external/perl/MODULES.txt';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';

my $here = dirname($0);

Expand All @@ -27183,7 +27183,7 @@ unless (caller) {
);

use lib '.';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use gentemplate;

print 'Creating ',$buildfile_template,"\n";
Expand All @@ -27200,8 +27200,8 @@ unless (caller) {

my $prepend = <<'_____';
use File::Spec::Functions;
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use lib '.';
use platform;
_____
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Mon May 9 17:36:16 2022 UTC"
#define DATE "built on: Mon May 16 03:45:11 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
14 changes: 7 additions & 7 deletions deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ our %config = (
"openssldir" => "",
"options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
"patch" => "3",
"perl_archname" => "x86_64-linux-gnu-thread-multi",
"perl_archname" => "x86_64-linux-thread-multi",
"perl_cmd" => "/usr/bin/perl",
"perl_version" => "5.30.0",
"perl_version" => "5.34.1",
"perlargv" => [
"no-comp",
"no-shared",
Expand Down Expand Up @@ -27508,8 +27508,8 @@ unless (caller) {
use File::Copy;
use Pod::Usage;

use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/rafaelgss/repos/os/node/deps/openssl/openssl/external/perl/MODULES.txt';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';

my $here = dirname($0);

Expand All @@ -27536,7 +27536,7 @@ unless (caller) {
);

use lib '.';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use gentemplate;

print 'Creating ',$buildfile_template,"\n";
Expand All @@ -27553,8 +27553,8 @@ unless (caller) {

my $prepend = <<'_____';
use File::Spec::Functions;
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use lib '.';
use platform;
_____
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Mon May 9 17:36:24 2022 UTC"
#define DATE "built on: Mon May 16 03:45:25 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
22 changes: 11 additions & 11 deletions deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ our %config = (
"openssldir" => "",
"options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
"patch" => "3",
"perl_archname" => "x86_64-linux-gnu-thread-multi",
"perl_archname" => "x86_64-linux-thread-multi",
"perl_cmd" => "/usr/bin/perl",
"perl_version" => "5.30.0",
"perl_version" => "5.34.1",
"perlargv" => [
"no-comp",
"no-shared",
Expand Down Expand Up @@ -8042,9 +8042,6 @@ our %unified_info = (
},
"apps/lib" => {
"deps" => [
"apps/lib/openssl-bin-cmp_mock_srv.o",
"apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
"apps/lib/uitest-bin-apps_ui.o",
"apps/lib/libapps-lib-app_libctx.o",
"apps/lib/libapps-lib-app_params.o",
"apps/lib/libapps-lib-app_provider.o",
Expand All @@ -8062,7 +8059,10 @@ our %unified_info = (
"apps/lib/libapps-lib-s_cb.o",
"apps/lib/libapps-lib-s_socket.o",
"apps/lib/libapps-lib-tlssrp_depr.o",
"apps/lib/libtestutil-lib-opt.o"
"apps/lib/libtestutil-lib-opt.o",
"apps/lib/openssl-bin-cmp_mock_srv.o",
"apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
"apps/lib/uitest-bin-apps_ui.o"
],
"products" => {
"bin" => [
Expand Down Expand Up @@ -27508,8 +27508,8 @@ unless (caller) {
use File::Copy;
use Pod::Usage;

use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/rafaelgss/repos/os/node/deps/openssl/openssl/external/perl/MODULES.txt';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';

my $here = dirname($0);

Expand All @@ -27536,7 +27536,7 @@ unless (caller) {
);

use lib '.';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use gentemplate;

print 'Creating ',$buildfile_template,"\n";
Expand All @@ -27553,8 +27553,8 @@ unless (caller) {

my $prepend = <<'_____';
use File::Spec::Functions;
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use lib '.';
use platform;
_____
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Mon May 9 17:36:36 2022 UTC"
#define DATE "built on: Mon May 16 03:45:43 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
14 changes: 7 additions & 7 deletions deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ our %config = (
"openssldir" => "",
"options" => "enable-ssl-trace enable-fips no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
"patch" => "3",
"perl_archname" => "x86_64-linux-gnu-thread-multi",
"perl_archname" => "x86_64-linux-thread-multi",
"perl_cmd" => "/usr/bin/perl",
"perl_version" => "5.30.0",
"perl_version" => "5.34.1",
"perlargv" => [
"no-comp",
"no-shared",
Expand Down Expand Up @@ -27156,8 +27156,8 @@ unless (caller) {
use File::Copy;
use Pod::Usage;

use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/rafaelgss/repos/os/node/deps/openssl/openssl/external/perl/MODULES.txt';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use OpenSSL::fallback '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/external/perl/MODULES.txt';

my $here = dirname($0);

Expand All @@ -27184,7 +27184,7 @@ unless (caller) {
);

use lib '.';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use gentemplate;

print 'Creating ',$buildfile_template,"\n";
Expand All @@ -27201,8 +27201,8 @@ unless (caller) {

my $prepend = <<'_____';
use File::Spec::Functions;
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/util/perl';
use lib '/home/danielbevenius/work/nodejs/node/deps/openssl/openssl/Configurations';
use lib '.';
use platform;
_____
Expand Down
Loading