From owner-svn-src-all@FreeBSD.ORG Sat Apr 27 05:44:41 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 032CF667; Sat, 27 Apr 2013 05:44:41 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CF5BC1F21; Sat, 27 Apr 2013 05:44:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3R5ie4J033374; Sat, 27 Apr 2013 05:44:40 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3R5idaX033370; Sat, 27 Apr 2013 05:44:39 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201304270544.r3R5idaX033370@svn.freebsd.org> From: Ed Schouten Date: Sat, 27 Apr 2013 05:44:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249971 - in head/secure: . lib/libcrypto X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Apr 2013 05:44:41 -0000 Author: ed Date: Sat Apr 27 05:44:39 2013 New Revision: 249971 URL: http://svnweb.freebsd.org/changeset/base/249971 Log: Remove references to MK_IDEA. As of r249959, we want to build with IDEA support enabled unconditionally. As this change removed the MK_IDEA flag, update these Makefiles accordingly. Modified: head/secure/Makefile.inc head/secure/lib/libcrypto/Makefile head/secure/lib/libcrypto/Makefile.inc Modified: head/secure/Makefile.inc ============================================================================== --- head/secure/Makefile.inc Sat Apr 27 05:06:25 2013 (r249970) +++ head/secure/Makefile.inc Sat Apr 27 05:44:39 2013 (r249971) @@ -8,10 +8,6 @@ CRYPTOBJDIR= ${.CURDIR}/../../lib/libcry CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt .endif -.if ${MK_IDEA} == "no" -CFLAGS+= -DNO_IDEA -.endif - .if ${MK_OPENSSH} != "no" SSHDIR= ${.CURDIR}/../../../crypto/openssh .endif Modified: head/secure/lib/libcrypto/Makefile ============================================================================== --- head/secure/lib/libcrypto/Makefile Sat Apr 27 05:06:25 2013 (r249970) +++ head/secure/lib/libcrypto/Makefile Sat Apr 27 05:44:39 2013 (r249971) @@ -200,10 +200,8 @@ SRCS+= hm_ameth.c hm_pmeth.c hmac.c INCS+= hmac.h # idea -.if ${MK_IDEA} != "no" SRCS+= i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c INCS+= idea.h -.endif # krb5 INCS+= krb5_asn.h @@ -404,12 +402,6 @@ opensslconf.h: opensslconf-${MACHINE_CPU .endif cp -f ${.ALLSRC} ${.TARGET} -.if ${MK_IDEA} == "no" -evp.h: ${LCRYPTO_SRC}/crypto/evp/evp.h - sed '/^#ifndef OPENSSL_NO_IDEA$$/,/^#endif$$/d' ${.ALLSRC} > ${.TARGET} -CLEANFILES+= evp.h -.endif - OLDSYMLINKS+= libdes.a libdes.so libdes.so.3 libdes_p.a afterinstall: @${ECHO} "Removing stale symlinks." @@ -430,10 +422,6 @@ afterinstall: _bn_asmpath= ${LCRYPTO_SRC}/crypto/bn/asm .endif -.if ${MK_IDEA} != "no" -_ideapath= ${LCRYPTO_SRC}/crypto/idea -.endif - .PATH: ${LCRYPTO_SRC}/crypto \ ${LCRYPTO_SRC}/crypto/aes \ ${LCRYPTO_SRC}/crypto/asn1 \ @@ -459,7 +447,7 @@ _ideapath= ${LCRYPTO_SRC}/crypto/idea ${LCRYPTO_SRC}/crypto/err \ ${LCRYPTO_SRC}/crypto/evp \ ${LCRYPTO_SRC}/crypto/hmac \ - ${_ideapath} \ + ${LCRYPTO_SRC}/crypto/idea \ ${LCRYPTO_SRC}/crypto/krb5 \ ${LCRYPTO_SRC}/crypto/lhash \ ${LCRYPTO_SRC}/crypto/md4 \ Modified: head/secure/lib/libcrypto/Makefile.inc ============================================================================== --- head/secure/lib/libcrypto/Makefile.inc Sat Apr 27 05:06:25 2013 (r249970) +++ head/secure/lib/libcrypto/Makefile.inc Sat Apr 27 05:44:39 2013 (r249971) @@ -13,10 +13,6 @@ CFLAGS+= -DTERMIOS -DANSI_SOURCE CFLAGS+= -I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto -I${.OBJDIR} CFLAGS+= -DOPENSSL_THREADS -DDSO_DLFCN -DHAVE_DLFCN_H -.if ${MK_IDEA} == "no" -CFLAGS+= -DOPENSSL_NO_IDEA -.endif - .if ${MACHINE_CPUARCH} == "amd64" CFLAGS+=-DL_ENDIAN -DOPENSSL_IA32_SSE2 CFLAGS+=-DAES_ASM -DBSAES_ASM -DVPAES_ASM