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

Jump to bottom

deps,build,tools: fix openssl-is-fips for ninja builds #40518

Closed
wants to merge 3 commits into from
Closed

deps,build,tools: fix openssl-is-fips for ninja builds #40518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
757e147
deps,build,tools: fix openssl-is-fips for ninja builds
danbev Oct 19, 2021
7cf53e5
deps: regenerate OpenSSL arch files
danbev Oct 19, 2021
cf7801d
deps: attempt to suppress macro-redefined warning
danbev Oct 19, 2021
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
1 change: 1 addition & 0 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1980,6 +1980,7 @@ def make_bin_override():


gyp_args = ['--no-parallel', '-Dconfiguring_node=1']
gyp_args += ['-Dbuild_type=' + config['BUILDTYPE']]

if options.use_ninja:
gyp_args += ['-f', 'ninja']
Expand Down
8 changes: 4 additions & 4 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 @@ -7993,6 +7993,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 @@ -8010,10 +8013,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
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 Oct 18 06:50:11 2021 UTC"
#define DATE "built on: Tue Oct 19 08:07:57 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
4 changes: 2 additions & 2 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 @@ -9714,10 +9714,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
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 Oct 18 06:50:27 2021 UTC"
#define DATE "built on: Tue Oct 19 08:08:13 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
12 changes: 6 additions & 6 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 @@ -7937,6 +7937,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 @@ -7954,10 +7957,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 @@ -9632,10 +9632,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
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 Oct 18 06:50:42 2021 UTC"
#define DATE "built on: Tue Oct 19 08:08:28 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
8 changes: 4 additions & 4 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 @@ -7997,6 +7997,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 @@ -8014,10 +8017,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
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 Oct 18 06:50:56 2021 UTC"
#define DATE "built on: Tue Oct 19 08:08:42 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
8 changes: 4 additions & 4 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 @@ -7997,9 +7997,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 @@ -8017,7 +8014,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
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 Oct 18 06:51:15 2021 UTC"
#define DATE "built on: Tue Oct 19 08:09:01 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/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_64"
#define DATE "built on: Mon Oct 18 06:51:34 2021 UTC"
#define DATE "built on: Tue Oct 19 08:09:20 2021 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/VC-WIN32/asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ our %target = (
"LDFLAGS" => "/nologo /debug",
"MT" => "mt",
"MTFLAGS" => "-nologo",
"RANLIB" => "CODE(0x560be0d17e50)",
"RANLIB" => "CODE(0x559b0de0c790)",
"RC" => "rc",
"_conf_fname_int" => [
"Configurations/00-base-templates.conf",
Expand Down Expand Up @@ -8047,9 +8047,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 @@ -8069,7 +8066,10 @@ our %unified_info = (
"apps/lib/libapps-lib-tlssrp_depr.o",
"apps/lib/libapps-lib-win32_init.o",
"apps/lib/libtestutil-lib-opt.o",
"apps/lib/libtestutil-lib-win32_init.o"
"apps/lib/libtestutil-lib-win32_init.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 @@ -9769,10 +9769,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/libfips-lib-self_test_kats.o",
"providers/fips/fips-dso-fips_entry.o"
],
"products" => {
"dso" => [
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/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: "
#define DATE "built on: Mon Oct 18 07:04:45 2021 UTC"
#define DATE "built on: Tue Oct 19 08:22:31 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ our %target = (
"LDFLAGS" => "/nologo /debug",
"MT" => "mt",
"MTFLAGS" => "-nologo",
"RANLIB" => "CODE(0x5625caa48ae0)",
"RANLIB" => "CODE(0x5582b32d0400)",
"RC" => "rc",
"_conf_fname_int" => [
"Configurations/00-base-templates.conf",
Expand Down Expand Up @@ -9769,10 +9769,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/libfips-lib-self_test_kats.o",
"providers/fips/fips-dso-fips_entry.o"
],
"products" => {
"dso" => [
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/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: "
#define DATE "built on: Mon Oct 18 07:04:59 2021 UTC"
#define DATE "built on: Tue Oct 19 08:22:45 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ our %target = (
"LDFLAGS" => "/nologo /debug",
"MT" => "mt",
"MTFLAGS" => "-nologo",
"RANLIB" => "CODE(0x561d0f2ee970)",
"RANLIB" => "CODE(0x55e3f9508dd0)",
"RC" => "rc",
"_conf_fname_int" => [
"Configurations/00-base-templates.conf",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/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: "
#define DATE "built on: Mon Oct 18 07:05:13 2021 UTC"
#define DATE "built on: Tue Oct 19 08:23:00 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
10 changes: 5 additions & 5 deletions deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ our %target = (
"LDFLAGS" => "/nologo /debug",
"MT" => "mt",
"MTFLAGS" => "-nologo",
"RANLIB" => "CODE(0x55a97a668aa0)",
"RANLIB" => "CODE(0x561b8a345980)",
"RC" => "rc",
"_conf_fname_int" => [
"Configurations/00-base-templates.conf",
Expand Down Expand Up @@ -7983,9 +7983,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 @@ -8005,7 +8002,10 @@ our %unified_info = (
"apps/lib/libapps-lib-tlssrp_depr.o",
"apps/lib/libapps-lib-win32_init.o",
"apps/lib/libtestutil-lib-opt.o",
"apps/lib/libtestutil-lib-win32_init.o"
"apps/lib/libtestutil-lib-win32_init.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
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64-ARM/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: VC-WIN64-ARM"
#define DATE "built on: Mon Oct 18 07:05:26 2021 UTC"
#define DATE "built on: Tue Oct 19 08:23:12 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
10 changes: 5 additions & 5 deletions deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ our %target = (
"LDFLAGS" => "/nologo /debug",
"MT" => "mt",
"MTFLAGS" => "-nologo",
"RANLIB" => "CODE(0x5606abb4c230)",
"RANLIB" => "CODE(0x55dcfa1252b0)",
"RC" => "rc",
"_conf_fname_int" => [
"Configurations/00-base-templates.conf",
Expand Down Expand Up @@ -8054,9 +8054,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 @@ -8076,7 +8073,10 @@ our %unified_info = (
"apps/lib/libapps-lib-tlssrp_depr.o",
"apps/lib/libapps-lib-win32_init.o",
"apps/lib/libtestutil-lib-opt.o",
"apps/lib/libtestutil-lib-win32_init.o"
"apps/lib/libtestutil-lib-win32_init.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
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64A/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: "
#define DATE "built on: Mon Oct 18 07:03:56 2021 UTC"
#define DATE "built on: Tue Oct 19 08:21:43 2021 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
Loading