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: make VC-WIN config generation deterministic #27543

Closed
wants to merge 1 commit into from
Closed

deps: make VC-WIN config generation deterministic #27543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion deps/openssl/config/Makefile_VC-WIN32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5678,8 +5678,10 @@ engines/padlock-dso-e_padlock.obj: engines/padlock-dso-e_padlock.d
engines/padlock.def: util/engines.num util/mkdef.pl
$(PERL) util/mkdef.pl --ordinals util/engines.num --name padlock --OS windows > engines/padlock.def

distclean:
clean:
$(RM) $(GENERATED_MANDATORY)
$(RM) $(GENERATED)
distclean:
$(RM) configdata.pm
$(RM) makefile
$(RM) NUL
5 changes: 4 additions & 1 deletion deps/openssl/config/Makefile_VC-WIN64-ARM
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ MINOR=1.1
SHLIB_VERSION_NUMBER=1.1

GENERATED_MANDATORY=crypto/include/internal/bn_conf.h crypto/include/internal/dso_conf.h include/openssl/opensslconf.h
GENERATED=crypto/buildinf.h apps/progs.h

INSTALL_LIBS="libcrypto.lib" "libssl.lib"
INSTALL_SHLIBS="libcrypto-1_1-arm64.dll" "libssl-1_1-arm64.dll"
Expand Down Expand Up @@ -141,7 +142,9 @@ include/openssl/opensslconf.h:
"$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \
"-omakefile" "include/openssl/opensslconf.h.in" > $@

distclean:
clean:
$(RM) $(GENERATED_MANDATORY)
$(RM) $(GENERATED)
distclean:
$(RM) /Q /F configdata.pm
$(RM) /Q /F makefile
4 changes: 3 additions & 1 deletion deps/openssl/config/Makefile_VC-WIN64A
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2950,7 +2950,9 @@ engines/e_padlock.d: "engines/e_padlock.c"
engines/e_padlock.obj: engines/e_padlock.d
$(CC) $(DSO_CFLAGS) /I "include" $(DSO_CPPFLAGS) -c $(COUTFLAG)$@ "engines/e_padlock.c"

distclean:
clean:
$(RM) $(GENERATED_MANDATORY)
$(RM) $(GENERATED)
distclean:
$(RM) /Q /F configdata.pm
$(RM) /Q /F makefile
2 changes: 1 addition & 1 deletion deps/openssl/config/generate_gypi.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
# Generate arch dependent header files with Makefile
my $buildinf = "crypto/buildinf.h";
my $progs = "apps/progs.h";
my $cmd1 = "cd ../openssl; make -f $makefile build_generated $buildinf $progs;";
my $cmd1 = "cd ../openssl; make -f $makefile clean build_generated $buildinf $progs;";
system($cmd1) == 0 or die "Error in system($cmd1)";

# Copy and move all arch dependent header files into config/archs
Expand Down