The branch OpenSSL_1_1_1-stable has been updated
via 695bc60fe4abbe2e6ef3039f96bade5315778c98 (commit)
from 72a859c9755ef845c83d53986b3d48b0f1ee5430 (commit)
- Log -----------------------------------------------------------------
commit 695bc60fe4abbe2e6ef3039f96bade5315778c98
Author: Richard Levitte <[email protected]>
Date: Mon Oct 15 17:38:26 2018 +0200
Build file templates: look at *all* defines
When looking at configured macro definitions, we must look at both
what comes from the config target AND what comes from user
configuration.
Fixes #7396
Reviewed-by: Ben Kaduk <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/7402)
(cherry picked from commit 92ebf6c4c21ff4b41ba1fd69af74b2039e138114)
-----------------------------------------------------------------------
Summary of changes:
Configurations/unix-Makefile.tmpl | 8 ++++----
Configurations/windows-makefile.tmpl | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index 16af4d2..5c0604d 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -495,11 +495,11 @@ install_dev:
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@$(ECHO) "*** Installing development files"
@$(PERL) $(SRCDIR)/util/mkdir-p.pl
$(DESTDIR)$(INSTALLTOP)/include/openssl
- @ : {- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" }
@{$target{defines}}; "" -}
+ @ : {- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" }
(@{$target{defines}}, @{$config{defines}}); "" -}
@$(ECHO) "install $(SRCDIR)/ms/applink.c ->
$(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c"
@cp $(SRCDIR)/ms/applink.c
$(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c
@chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c
- @ : {- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" }
@{$target{defines}}; "" -}
+ @ : {- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" }
(@{$target{defines}}, @{$config{defines}}); "" -}
@set -e; for i in $(SRCDIR)/include/openssl/*.h \
$(BLDDIR)/include/openssl/*.h; do \
fn=`basename $$i`; \
@@ -570,10 +570,10 @@ install_dev:
uninstall_dev:
@$(ECHO) "*** Uninstalling development files"
- @ : {- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" }
@{$target{defines}}; "" -}
+ @ : {- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" }
(@{$target{defines}}, @{$config{defines}}); "" -}
@$(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c"
@$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c
- @ : {- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" }
@{$target{defines}}; "" -}
+ @ : {- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" }
(@{$target{defines}}, @{$config{defines}}); "" -}
@set -e; for i in $(SRCDIR)/include/openssl/*.h \
$(BLDDIR)/include/openssl/*.h; do \
fn=`basename $$i`; \
diff --git a/Configurations/windows-makefile.tmpl
b/Configurations/windows-makefile.tmpl
index f7d8e27..bc79205 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -410,10 +410,10 @@ install_dev:
@if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" &
exit 1 )
@$(ECHO) "*** Installing development files"
@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\include\openssl"
- @{- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" }
@{$config{defines}}; "" -}
+ @{- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" }
(@{$target{defines}}, @{$config{defines}}); "" -}
@"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\ms\applink.c" \
"$(INSTALLTOP)\include\openssl"
- @{- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" }
@{$config{defines}}; "" -}
+ @{- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" }
(@{$target{defines}}, @{$config{defines}}); "" -}
@"$(PERL)" "$(SRCDIR)\util\copy.pl" "-exclude_re=/__DECC_" \
"$(SRCDIR)\include\openssl\*.h" \
"$(INSTALLTOP)\include\openssl"
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
