Commit 695bc60f authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarBen Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/7402)

(cherry picked from commit 92ebf6c4c21ff4b41ba1fd69af74b2039e138114)
parent 72a859c9

Configurations/unix-Makefile.tmpl

+4 −4
Original line number Diff line number Diff line
@@ -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`; \

Configurations/windows-makefile.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -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"