From 37c8876001d3fb152426da64e07b8056eea2cdfd Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Mon, 31 Jan 2011 22:44:18 +0000 Subject: [PATCH] pull up r24525 from trunk ------------------------------------------------------------------------ r24525 | ghudson | 2010-11-21 12:35:49 -0500 (Sun, 21 Nov 2010) | 4 lines Suppress building camellia-gen in "make check" for now (it has a build issue on Solaris which will go away when Camellia support becomes unconditional). ticket: 6847 version_fixed: 1.9.1 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@24608 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/builtin/camellia/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/crypto/builtin/camellia/Makefile.in b/src/lib/crypto/builtin/camellia/Makefile.in index e6c86bc13..b11716ecc 100644 --- a/src/lib/crypto/builtin/camellia/Makefile.in +++ b/src/lib/crypto/builtin/camellia/Makefile.in @@ -39,7 +39,8 @@ camellia-gen: camellia-gen.o $(GEN_OBJS) run-camellia-gen: camellia-gen ./camellia-gen > kresults.out -check:: run-camellia-gen +# Enable when Camellia support becomes unconditional. +#check:: run-camellia-gen clean-unix:: clean-libobjs -- 2.26.2