[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Fri Feb 19 07:58:25 UTC 2016
The branch master has been updated
via 5be5e56c09015633d94fb1ee1290081a78074546 (commit)
via 70ef905779dac29053256dd98c759f492073c39c (commit)
via 1576663231b7c51c60b0d90e34e36c9345e5b739 (commit)
via 27f42b46798635be49004c70b2f351189020bb98 (commit)
from c058fcd79877530f18a288664ea71def012c405a (commit)
- Log -----------------------------------------------------------------
commit 5be5e56c09015633d94fb1ee1290081a78074546
Author: Richard Levitte <levitte at openssl.org>
Date: Fri Feb 19 02:35:33 2016 +0100
VMS: rather use a quick file comparison than DIFF
VMS DIFF tries to calculate all the differences, which is slower than
just reading the files and stopping at the first difference. The
latter doesn't exist as a command, so the problem is solved with perl
and File::Compare (has been in core perl since very early version 5).
Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
commit 70ef905779dac29053256dd98c759f492073c39c
Author: Richard Levitte <levitte at openssl.org>
Date: Fri Feb 19 02:34:20 2016 +0100
VMS: produce dependency files just like you produce object files
We need to do the same dance as when object files are created.
Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
commit 1576663231b7c51c60b0d90e34e36c9345e5b739
Author: Richard Levitte <levitte at openssl.org>
Date: Fri Feb 19 02:32:22 2016 +0100
Fix casing on VMS
DCL may be in extended parsing style, which makes it less case
insensitive, so when removing a string from another, make sure to get
casing correctly.
Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
commit 27f42b46798635be49004c70b2f351189020bb98
Author: Richard Levitte <levitte at openssl.org>
Date: Fri Feb 19 02:30:51 2016 +0100
Don't use config.timestamp, we already have configdata.pm
The benefit with using configdata.pm is that Configure writes it for
us.
Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configurations/descrip.mms.tmpl | 36 ++++++++++++++++++------------------
Configurations/unix-Makefile.tmpl | 21 ++++++++++-----------
2 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 065d5a3..dd00fd3 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -156,7 +156,7 @@ ASFLAG={- $target{asflags} -}
NODEBUG=@
.FIRST :
$(NODEBUG) openssl_inc1 = F$PARSE("[.include.openssl]","A.;",,,"syntax_only") - "A.;"
- $(NODEBUG) openssl_inc2 = F$PARSE("{- catdir($config{sourcedir},"[.include.openssl]") -}","a.;",,,"SYNTAX_ONLY") - "A.;"
+ $(NODEBUG) openssl_inc2 = F$PARSE("{- catdir($config{sourcedir},"[.include.openssl]") -}","A.;",,,"SYNTAX_ONLY") - "A.;"
$(NODEBUG) internal_inc1 = F$PARSE("[.crypto.include.internal]","A.;",,,"SYNTAX_ONLY") - "A.;"
$(NODEBUG) internal_inc2 = F$PARSE("{- catdir($config{sourcedir},"[.include.internal]") -}","A.;",,,"SYNTAX_ONLY") - "A.;"
$(NODEBUG) internal_inc3 = F$PARSE("{- catdir($config{sourcedir},"[.crypto.include.internal]") -}","A.;",,,"SYNTAX_ONLY") - "A.;"
@@ -204,20 +204,20 @@ NODEBUG=@
# The main targets ###################################################
-all : config.timestamp, -
+all : configdata.pm, -
build_libs_nodep, build_engines_nodep, build_apps_nodep, -
depend
-build_libs : config.timestamp, build_libs_nodep, depend
+build_libs : configdata.pm, build_libs_nodep, depend
build_libs_nodep : $(LIBS)
-build_engines : config.timestamp, build_engines_nodep, depend
+build_engines : configdata.pm, build_engines_nodep, depend
build_engines_nodep : $(ENGINES)
-build_apps : config.timestamp, build_apps_nodep, depend
+build_apps : configdata.pm, build_apps_nodep, depend
build_apps_nodep : $(PROGRAMS), $(SCRIPTS)
-build_tests : config.timestamp, build_tests_nodep, depend
+build_tests : configdata.pm, build_tests_nodep, depend
build_tests_nodep : $(TESTPROGS)
-test tests : config.timestamp, -
+test tests : configdata.pm, -
build_apps_nodep, build_engines_nodep, build_tests_nodep, -
depend, rehash
SET DEFAULT [.test]{- move("test") -}
@@ -260,10 +260,10 @@ descrip.mms : FORCE
< descrip.mms > descrip.mms-new
@ OPEN/APPEND DESCRIP descrip.mms-new
@ WRITE DESCRIP "# DO NOT DELETE THIS LINE -- make depend depends on it."
- @ {- join("\n\t", map { "IF F\$SEARCH(\"$_\") .NES. \"\" THEN TYPE $_ /OUTPUT=DESCRIP:" } @deps); -}
+ {- join("\n\t", map { "\@ IF F\$SEARCH(\"$_\") .NES. \"\" THEN TYPE $_ /OUTPUT=DESCRIP:" } @deps); -}
@ CLOSE DESCRIP
- @ DIFF/OUTPUT=NLA0: descrip.mms,descrip.mms-new
- @ IF $SEVERITY .EQ. 3 THEN RENAME descrip.mms-new descrip.mms
+ @ PIPE ( $(PERL) -e "use File::Compare qw/compare_text/; my $x = compare_text(""descrip.mms"",""descrip.mms-new""); exit(0x10000000 + ($x == 0));" || -
+ RENAME descrip.mms-new descrip.mms )
@ IF F$SEARCH("descrip.mms-new") .NES. "" THEN DELETE descrip.mms-new;*
-@ SPAWN/OUTPUT=NLA0: PURGE/NOLOG descrip.mms
@@ -351,7 +351,7 @@ install_config : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com -
{- sourcefile("VMS", "openssl_shutdown.com.in") -} -
> [.VMS]openssl_shutdown.com
-vmsconfig.pm : config.timestamp
+vmsconfig.pm : configdata.pm
OPEN/WRITE/SHARE=READ CONFIG []vmsconfig.pm
WRITE CONFIG "package vmsconfig;"
WRITE CONFIG "use strict; use warnings;"
@@ -402,7 +402,7 @@ debug_logicals :
# Building targets ###################################################
-config.timestamp : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCDIR)Configure ! $(SRCDIR)config.com
+configdata.pm : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCDIR)Configure ! $(SRCDIR)config.com
@ WRITE SYS$OUTPUT "Detected changed: $?"
@ WRITE SYS$OUTPUT "Reconfiguring..."
perl $(SRCDIR)Configure reconf
@@ -411,12 +411,7 @@ config.timestamp : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCD
@ WRITE SYS$OUTPUT "*** Please run the same mms command again ***"
@ WRITE SYS$OUTPUT "*** ***"
@ WRITE SYS$OUTPUT "*************************************************"
- @ IF F$SEARCH("config.timestamp",1) .NES. "" THEN -
- OPEN/APPEND TIMESTAMP "config.timestamp"
- @ IF F$SEARCH("config.timestamp",2) .EQS. "" THEN -
- OPEN/WRITE TIMESTAMP "config.timestamp"
- @ close TIMESTAMP
- @ exit %10000000
+ @ PIPE ( EXIT %X10000000 )
{-
use File::Basename;
@@ -450,7 +445,12 @@ config.timestamp : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCD
return <<"EOF";
$obj.MMS : $deps
+ ${before}
+ SET DEFAULT $forward
\$(CC) \$(CFLAGS)${incs} /MMS=(FILE=${objd}${objn}.MMS,TARGET=$obj.OBJ) /NOOBJECT $srcs
+ SET DEFAULT $backward
+ ${after}
+ - PURGE $obj.MMS
$obj.OBJ : $obj.MMS
${before}
SET DEFAULT $forward
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 092a7b3..693b2fd 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -150,16 +150,16 @@ PROCESSOR= {- $config{processor} -}
# The main targets ###################################################
-all: config.timestamp build_libs_nodep build_engines_nodep build_apps_nodep \
+all: configdata.pm build_libs_nodep build_engines_nodep build_apps_nodep \
depend link-utils
-build_libs: config.timestamp build_libs_nodep depend
+build_libs: configdata.pm build_libs_nodep depend
build_libs_nodep: libcrypto.pc libssl.pc openssl.pc
-build_engines: config.timestamp build_engines_nodep depend
+build_engines: configdata.pm build_engines_nodep depend
build_engines_nodep: $(ENGINES)
-build_apps: config.timestamp build_apps_nodep depend
+build_apps: configdata.pm build_apps_nodep depend
build_apps_nodep: $(PROGRAMS) $(SCRIPTS)
-build_tests: config.timestamp build_tests_nodep depend
+build_tests: configdata.pm build_tests_nodep depend
build_tests_nodep: $(TESTPROGS)
test tests: build_tests_nodep build_apps_nodep build_engines_nodep depend rehash
@@ -598,12 +598,12 @@ rehash: link-utils copy-certs build_apps_nodep
link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/shlib_wrap.sh
-$(BLDDIR)/util/opensslwrap.sh: config.timestamp
+$(BLDDIR)/util/opensslwrap.sh: configdata.pm
@if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \
mkdir -p "$(BLDDIR)/util"; \
ln -sf "../$(SRCDIR)/util/opensslwrap.sh" "$(BLDDIR)/util"; \
fi
-$(BLDDIR)/util/shlib_wrap.sh: config.timestamp
+$(BLDDIR)/util/shlib_wrap.sh: configdata.pm
@if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \
mkdir -p "$(BLDDIR)/util"; \
ln -sf "../$(SRCDIR)/util/shlib_wrap.sh" "$(BLDDIR)/util"; \
@@ -661,7 +661,7 @@ FORCE:
# Building targets ###################################################
-libcrypto.pc libssl.pc openssl.pc: config.timestamp $(LIBS)
+libcrypto.pc libssl.pc openssl.pc: configdata.pm $(LIBS)
libcrypto.pc:
@ ( echo 'prefix=$(INSTALLTOP)'; \
echo 'exec_prefix=$${prefix}'; \
@@ -704,8 +704,8 @@ openssl.pc:
# wasn't passed down automatically. It's quite safe to use it like we do
# below; if it doesn't exist, the result will be empty and 'make' will pick
# up $(MAKEFLAGS) which is passed down as an environment variable.
-config.timestamp: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/config
- @echo "Detected that {- $config{build_file_template} -}, $(SRCDIR)/Configure or $(SRCDIR)/config may have changed."
+configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/config
+ @echo "Detected changed: $?"
@echo "Reconfiguring..."
$(SRCDIR)/Configure reconf
@echo "**************************************************"
@@ -713,7 +713,6 @@ config.timestamp: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDI
@echo "*** Please run the same make command again ***"
@echo "*** ***"
@echo "**************************************************"
- @touch config.timestamp
@false
{-
More information about the openssl-commits
mailing list