d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove references to MK_IDEA.

Browse Source 
As of r249959, we want to build with IDEA support enabled
unconditionally. As this change removed the MK_IDEA flag, update these
Makefiles accordingly.
This commit is contained in:
Ed Schouten 2013-04-27 05:44:39 +00:00
parent 24084cdd91
commit 2bc87cacee
3 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
secure/Makefile.inc
View File

@ -8,10 +8,6 @@ CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj
CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt
.endif .endif
.if ${MK_IDEA} == "no"
CFLAGS+= -DNO_IDEA
.endif
.if ${MK_OPENSSH} != "no" .if ${MK_OPENSSH} != "no"
SSHDIR= ${.CURDIR}/../../../crypto/openssh SSHDIR= ${.CURDIR}/../../../crypto/openssh
.endif .endif

14
secure/lib/libcrypto/Makefile
View File

@ -200,10 +200,8 @@ SRCS+= hm_ameth.c hm_pmeth.c hmac.c
INCS+= hmac.h INCS+= hmac.h
# idea # idea
.if ${MK_IDEA} != "no"
SRCS+= i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c SRCS+= i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c
INCS+= idea.h INCS+= idea.h
.endif
# krb5 # krb5
INCS+= krb5_asn.h INCS+= krb5_asn.h
@ -404,12 +402,6 @@ opensslconf.h: opensslconf-${MACHINE_CPUARCH}.h
.endif .endif
cp -f ${.ALLSRC} ${.TARGET} 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 OLDSYMLINKS+= libdes.a libdes.so libdes.so.3 libdes_p.a
afterinstall: afterinstall:
@${ECHO} "Removing stale symlinks." @${ECHO} "Removing stale symlinks."
@ -430,10 +422,6 @@ afterinstall:
_bn_asmpath= ${LCRYPTO_SRC}/crypto/bn/asm _bn_asmpath= ${LCRYPTO_SRC}/crypto/bn/asm
.endif .endif
.if ${MK_IDEA} != "no"
_ideapath= ${LCRYPTO_SRC}/crypto/idea
.endif
.PATH: ${LCRYPTO_SRC}/crypto \ .PATH: ${LCRYPTO_SRC}/crypto \
${LCRYPTO_SRC}/crypto/aes \ ${LCRYPTO_SRC}/crypto/aes \
${LCRYPTO_SRC}/crypto/asn1 \ ${LCRYPTO_SRC}/crypto/asn1 \
@ -459,7 +447,7 @@ _ideapath= ${LCRYPTO_SRC}/crypto/idea
${LCRYPTO_SRC}/crypto/err \ ${LCRYPTO_SRC}/crypto/err \
${LCRYPTO_SRC}/crypto/evp \ ${LCRYPTO_SRC}/crypto/evp \
${LCRYPTO_SRC}/crypto/hmac \ ${LCRYPTO_SRC}/crypto/hmac \
${_ideapath} \ ${LCRYPTO_SRC}/crypto/idea \
${LCRYPTO_SRC}/crypto/krb5 \ ${LCRYPTO_SRC}/crypto/krb5 \
${LCRYPTO_SRC}/crypto/lhash \ ${LCRYPTO_SRC}/crypto/lhash \
${LCRYPTO_SRC}/crypto/md4 \ ${LCRYPTO_SRC}/crypto/md4 \

4
secure/lib/libcrypto/Makefile.inc
View File

@ -13,10 +13,6 @@ CFLAGS+= -DTERMIOS -DANSI_SOURCE
CFLAGS+= -I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto -I${.OBJDIR} CFLAGS+= -I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto -I${.OBJDIR}
CFLAGS+= -DOPENSSL_THREADS -DDSO_DLFCN -DHAVE_DLFCN_H CFLAGS+= -DOPENSSL_THREADS -DDSO_DLFCN -DHAVE_DLFCN_H
.if ${MK_IDEA} == "no"
CFLAGS+= -DOPENSSL_NO_IDEA
.endif
.if ${MACHINE_CPUARCH} == "amd64" .if ${MACHINE_CPUARCH} == "amd64"
CFLAGS+=-DL_ENDIAN -DOPENSSL_IA32_SSE2 CFLAGS+=-DL_ENDIAN -DOPENSSL_IA32_SSE2
CFLAGS+=-DAES_ASM -DBSAES_ASM -DVPAES_ASM CFLAGS+=-DAES_ASM -DBSAES_ASM -DVPAES_ASM