[git] GCRYPT - branch, master, updated. libgcrypt-1.6.0-165-g2564d20

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU crypto library".

The branch, master has been updated
       via  2564d204e408b296425ac0660c6bdc6270575fb6 (commit)
      from  ceaa97f0d849c07f3a15b642fc3a2b0a477b4a47 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2564d204e408b296425ac0660c6bdc6270575fb6
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 28 15:13:50 2015 +0100

    Fix building of GOST s-boxes when cross-compiling.
    
    * cipher/Makefile.am (gost-s-box): USe CC_FOR_BUILD.
    (noinst_PROGRAMS): Remove.
    (EXTRA_DIST): New.
    (CLEANFILES): New.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index 4a9c86d..33a68ff 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -26,8 +26,10 @@ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 
 AM_CCASFLAGS = $(NOEXECSTACK_FLAGS)
 
-DISTCLEANFILES = gost-sb.h
+EXTRA_DIST = gost-s-box.c
 
+CLEANFILES = gost-s-box
+DISTCLEANFILES = gost-sb.h
 
 noinst_LTLIBRARIES = libcipher.la
 
@@ -96,10 +98,13 @@ rfc2268.c \
 camellia.c camellia.h camellia-glue.c camellia-aesni-avx-amd64.S \
   camellia-aesni-avx2-amd64.S camellia-arm.S
 
-noinst_PROGRAMS = gost-s-box
 gost28147.lo: gost-sb.h
 gost-sb.h: gost-s-box
-	$(builddir)/gost-s-box $@
+	./gost-s-box $@
+
+gost-s-box: gost-s-box.c
+	$(CC_FOR_BUILD) -o $@ $(srcdir)/gost-s-box.c
+
 
 if ENABLE_O_FLAG_MUNGING
 o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g'

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

Summary of changes:
 cipher/Makefile.am | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org


_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits