[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6bfb7db35a426e5f070e744b56c913c739a40634 (commit)
       via  d43a8fdcd495825a3507950caa4cdc7e81d681db (commit)
      from  58a8fc25d73d8558df25d998f85d4714fbbe74ac (commit)


- Log -----------------------------------------------------------------
commit 6bfb7db35a426e5f070e744b56c913c739a40634
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Mar 13 21:54:49 2016 +0100

    build.info/Makefile.in: Itanium fixups.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit d43a8fdcd495825a3507950caa4cdc7e81d681db
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Mar 13 21:49:15 2016 +0100

    engines/Makefile.in: some [older] shell complain about 'for i ;',
    but not if there is reference to empty variable.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/Makefile.in |  2 +-
 crypto/rc4/build.info | 16 ++++++++--------
 crypto/sha/build.info |  6 +++---
 engines/Makefile.in   |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/crypto/bn/Makefile.in b/crypto/bn/Makefile.in
index 85b7d56..eb610e7 100644
--- a/crypto/bn/Makefile.in
+++ b/crypto/bn/Makefile.in
@@ -105,7 +105,7 @@ rsaz-avx2.s:	asm/rsaz-avx2.pl
 	$(PERL) asm/rsaz-avx2.pl $(PERLASM_SCHEME) $@
 
 bn-ia64.s:	asm/ia64.S
-	$(CC) $(CFLAGS) -E asm/ia64.S $@
+	$(CC) $(CFLAGS) -E asm/ia64.S > $@
 ia64-mont.s:	asm/ia64-mont.pl
 	$(PERL) asm/ia64-mont.pl $(CFLAGS) $@
 
diff --git a/crypto/rc4/build.info b/crypto/rc4/build.info
index 8e6df35..d82a9ed 100644
--- a/crypto/rc4/build.info
+++ b/crypto/rc4/build.info
@@ -8,17 +8,17 @@ DEPEND[rc4-586.s]=../perlasm/x86asm.pl
 GENERATE[rc4-x86_64.s]=asm/rc4-x86_64.pl $(PERLASM_SCHEME)
 GENERATE[rc4-md5-x86_64.s]=asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME)
 
-GENERATE[rc4-ia64.S]=asm/rc4-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
-
 GENERATE[rc4-parisc.s]=asm/rc4-parisc.pl $(PERLASM_SCHEME)
 
 BEGINRAW[Makefile]
-{- $builddir -}/rc4-ia64.s: rc4-ia64.S
-	@case `awk '/^#define RC4_INT/{print$$NF}' $(SRCDIR)/include/openssl/opensslconf.h` in \
-	int)	set -x; $(CC) $(CFLAGS) $(LIB_CFLAGS) -DSZ=4 -E rc4-ia64.S > $@ ;; \
-	char)	set -x; $(CC) $(CFLAGS) $(LIB_CFLAGS) -DSZ=1 -E rc4-ia64.S > $@ ;; \
-	*)	exit 1 ;; \
-	esac
+{- $builddir -}/rc4-ia64.s: {- $sourcedir -}/asm/rc4-ia64.pl
+	@(trap "rm $@.*" INT 0; \
+	  perl $< $(CFLAGS) $(LIB_CFLAGS) $@.S; \
+	  case `awk '/^#define RC4_INT/{print$$NF}' $(BLDDIR)/include/openssl/opensslconf.h` in \
+	  int)	set -x; $(CC) $(CFLAGS) $(LIB_CFLAGS) -DSZ=4 -E $@.S > $@.i && mv -f $@.i $@;; \
+	  char)	set -x; $(CC) $(CFLAGS) $(LIB_CFLAGS) -DSZ=1 -E $@.S > $@.i && mv -f $@.i $@;; \
+	  *)	exit 1 ;; \
+	  esac )
 
 # GNU make "catch all"
 {- $builddir -}/rc4-%.s:	{- $sourcedir -}/asm/rc4-%.pl
diff --git a/crypto/sha/build.info b/crypto/sha/build.info
index 55248b3..7aa3a91 100644
--- a/crypto/sha/build.info
+++ b/crypto/sha/build.info
@@ -9,9 +9,9 @@ DEPEND[sha256-586.s]=../perlasm/x86asm.pl
 GENERATE[sha512-586.s]=asm/sha512-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)
 DEPEND[sha512-586.s]=../perlasm/x86asm.pl
 
-GENERATE[sha1-ia64.s]=sha1-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
-GENERATE[sha256-ia64.s]=sha512-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
-GENERATE[sha512-ia64.s]=sha512-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
+GENERATE[sha1-ia64.s]=asm/sha1-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
+GENERATE[sha256-ia64.s]=asm/sha512-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
+GENERATE[sha512-ia64.s]=asm/sha512-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
 
 GENERATE[sha1-alpha.s]=asm/sha1-alpha.pl
 
diff --git a/engines/Makefile.in b/engines/Makefile.in
index aaffe1e..4c8ca99 100644
--- a/engines/Makefile.in
+++ b/engines/Makefile.in
@@ -10,7 +10,7 @@ CFLAG=-g
 MAKEFILE=	Makefile
 AR=		ar r
 
-RECURSIVE_MAKE=[ -z "$(ENGDIRS)" ] || for i in $(ENGDIRS) ; do \
+RECURSIVE_MAKE= for i in $${ENGDIRS:-$(ENGDIRS)} ; do \
 		    (cd $$i && echo "making $$target in $(DIR)/$$i..." && \
 		    $(MAKE) -e TOP=../.. DIR=$$i $$target ) || exit 1; \
 		done;