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

crypto: normalize paths using SRCTOP-relative paths or :H when possible

Browse Source 
This simplifies make logic/output

MFC after:	1 month
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Enji Cooper 2017-03-04 11:35:30 +00:00
parent 4c3e79cedd
commit b71fb1a4aa
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
secure/Makefile
View File

@ -21,7 +21,7 @@ SPROGS+=usr.sbin/sendmail
# This target is used to rebuild these programs with crypto. # This target is used to rebuild these programs with crypto.
secure: .MAKE .PHONY secure: .MAKE .PHONY
.for entry in ${SPROGS} .for entry in ${SPROGS}
cd ${.CURDIR}/../${entry}; \ cd ${.CURDIR:H}/${entry}; \
${MAKE} cleandir; \ ${MAKE} cleandir; \
${MAKE} obj; \ ${MAKE} obj; \
${MAKE} all; \ ${MAKE} all; \
@ -31,7 +31,7 @@ secure: .MAKE .PHONY
# This target is used to rebuild these programs without crypto. # This target is used to rebuild these programs without crypto.
insecure: .MAKE .PHONY insecure: .MAKE .PHONY
.for entry in ${SPROGS} .for entry in ${SPROGS}
cd ${.CURDIR}/../${entry}; \ cd ${.CURDIR:H}/${entry}; \
${MAKE} MK_CRYPT=no cleandir; \ ${MAKE} MK_CRYPT=no cleandir; \
${MAKE} MK_CRYPT=no obj; \ ${MAKE} MK_CRYPT=no obj; \
${MAKE} MK_CRYPT=no all; \ ${MAKE} MK_CRYPT=no all; \

8
secure/Makefile.inc
View File

@ -2,14 +2,14 @@
.include <src.opts.mk> .include <src.opts.mk>
.if exists(${.CURDIR}/../../lib/libcrypt/obj) .if exists(${.CURDIR:H:H}/lib/libcrypt/obj)
CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt/obj
.else .else
CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt
.endif .endif
.if ${MK_OPENSSH} != "no" .if ${MK_OPENSSH} != "no"
SSHDIR= ${.CURDIR}/../../../crypto/openssh SSHDIR= ${SRCTOP}/crypto/openssh
.endif .endif
WARNS?= 0 WARNS?= 0

4
secure/lib/Makefile.inc
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
.include "../Makefile.inc" .include "../Makefile.inc"
.if exists(${.CURDIR}/../../../lib/Makefile.inc) .if exists(${.CURDIR:H:H:H}/lib/Makefile.inc)
.include "${.CURDIR}/../../../lib/Makefile.inc" .include "${.CURDIR:H:H:H}/lib/Makefile.inc"
.endif .endif

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

@ -6,7 +6,7 @@
OPENSSL_VER= 1.0.2k OPENSSL_VER= 1.0.2k
OPENSSL_DATE= 2017-01-26 OPENSSL_DATE= 2017-01-26
LCRYPTO_SRC= ${.CURDIR}/../../../crypto/openssl LCRYPTO_SRC= ${SRCTOP}/crypto/openssl
LCRYPTO_DOC= ${LCRYPTO_SRC}/doc LCRYPTO_DOC= ${LCRYPTO_SRC}/doc
CFLAGS+= -I${LCRYPTO_SRC} CFLAGS+= -I${LCRYPTO_SRC}

2
secure/lib/libcrypto/engines/Makefile.inc
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
LCRYPTO_SRC= ${.CURDIR}/../../../../../crypto/openssl LCRYPTO_SRC= ${SRCTOP}/crypto/openssl
.PATH: ${LCRYPTO_SRC}/engines ${LCRYPTO_SRC}/engines/ccgost .PATH: ${LCRYPTO_SRC}/engines ${LCRYPTO_SRC}/engines/ccgost
SHLIBDIR?= /usr/lib/engines SHLIBDIR?= /usr/lib/engines

2
secure/lib/libssh/Makefile
View File

@ -37,7 +37,7 @@ SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_bzero.c fmt_scaled.c \
.if ${MK_LDNS} == "no" .if ${MK_LDNS} == "no"
SRCS+= getrrsetbyname.c SRCS+= getrrsetbyname.c
.else .else
LDNSDIR= ${.CURDIR}/../../../contrib/ldns LDNSDIR= ${SRCTOP}/contrib/ldns
CFLAGS+= -DHAVE_LDNS=1 -I${LDNSDIR} CFLAGS+= -DHAVE_LDNS=1 -I${LDNSDIR}
SRCS+= getrrsetbyname-ldns.c SRCS+= getrrsetbyname-ldns.c
LIBADD+= ldns LIBADD+= ldns