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

Clean up OpenSSL makefiles.

Browse Source
This commit is contained in:
Jung-uk Kim 2015-11-06 17:39:17 +00:00
parent d3565bb67c
commit d7c49e6c15
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=290460
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
secure/lib/libcrypto/Makefile
View File

@ -14,12 +14,12 @@ NO_LINT=
.if exists(Makefile.man)
.include "Makefile.man"
.endif
.include "Makefile.inc"
.if defined(NOTYET)
MAN+= config.5 des_modes.7
.endif
.include "Makefile.inc"
# base sources
SRCS= cpt_err.c cryptlib.c cversion.c ex_data.c mem.c mem_dbg.c o_dir.c \
o_fips.c o_init.c o_str.c o_time.c uid.c
@ -380,6 +380,8 @@ INCSDIR= ${INCLUDEDIR}/openssl
CSTD= gnu89
CFLAGS+= -I${.OBJDIR}
CFLAGS+= -I${LCRYPTO_SRC}/crypto
CFLAGS+= -I${LCRYPTO_SRC}/crypto/asn1
CFLAGS+= -I${LCRYPTO_SRC}/crypto/evp
CFLAGS+= -I${LCRYPTO_SRC}/crypto/modes
@ -391,32 +393,32 @@ AFLAGS+= --noexecstack
ACFLAGS+= -Wa,--noexecstack
.endif
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
OPENSSLCONF_H= opensslconf-x86.h
.else
OPENSSLCONF_H= opensslconf-${MACHINE_CPUARCH}.h
.endif
CLEANFILES= buildinf.h opensslconf.h
buildinf.h: ${.CURDIR}/Makefile
buildinf.h: Makefile
( echo "#ifndef MK1MF_BUILD"; \
echo " /* auto-generated by util/mkbuildinf.pl for crypto/cversion.c */"; \
echo " #define CFLAGS \"compiler: ${COMPILER_TYPE}\""; \
echo " #define PLATFORM \"platform: FreeBSD-${MACHINE_ARCH}\""; \
echo "#endif" ) > ${.TARGET}
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
opensslconf.h: opensslconf-x86.h
.else
opensslconf.h: opensslconf-${MACHINE_CPUARCH}.h
.endif
${CP} ${.ALLSRC} ${.TARGET}
opensslconf.h: ${OPENSSLCONF_H}
${CP} ${.IMPSRC} ${.TARGET}
.include <bsd.lib.mk>
.if ${MACHINE_CPUARCH} == "amd64"
.PATH: ${.CURDIR}/amd64
.elif ${MACHINE_CPUARCH} == "i386"
.PATH: ${.CURDIR}/i386
_bn_asmpath= ${LCRYPTO_SRC}/crypto/bn/asm
.endif
.if ${MACHINE_CPUARCH} == "amd64"
_bn_asmpath= ${LCRYPTO_SRC}/crypto/bn/asm
.if exists(${.CURDIR}/${MACHINE_CPUARCH})
.PATH: ${.CURDIR}/${MACHINE_CPUARCH}
.endif
.PATH: ${LCRYPTO_SRC}/crypto \

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

@ -7,10 +7,10 @@ OPENSSL_VER= 1.0.2d
OPENSSL_DATE= 2015-07-09
LCRYPTO_SRC= ${.CURDIR}/../../../crypto/openssl
LCRYPTO_DOC= ${.CURDIR}/../../../crypto/openssl/doc
LCRYPTO_DOC= ${LCRYPTO_SRC}/doc
CFLAGS+= -I${LCRYPTO_SRC}
CFLAGS+= -DTERMIOS -DANSI_SOURCE
CFLAGS+= -I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto -I${.OBJDIR}
CFLAGS+= -DOPENSSL_THREADS -DDSO_DLFCN -DHAVE_DLFCN_H
.include <bsd.endian.mk>

2
secure/lib/libssl/Makefile
View File

@ -23,6 +23,8 @@ INCSDIR=${INCLUDEDIR}/openssl
LIBADD= crypto
CFLAGS+= -I${LCRYPTO_SRC}/crypto
.include <bsd.lib.mk>
.PATH: ${LCRYPTO_SRC}/ssl \

2
secure/usr.bin/openssl/Makefile
View File

@ -9,7 +9,7 @@ LIBADD= ssl crypto
.endif
.include "../../lib/libcrypto/Makefile.inc"
CFLAGS+=-DMONOLITH -I${.CURDIR}
CFLAGS+= -DMONOLITH
SRCS+= app_rand.c apps.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c \
dgst.c dh.c dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c \