From owner-svn-src-stable@freebsd.org Tue May 30 04:42:37 2017 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DCD9CAFC1D9; Tue, 30 May 2017 04:42:37 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B8F5977CC7; Tue, 30 May 2017 04:42:37 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4U4gavX095391; Tue, 30 May 2017 04:42:36 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4U4gaik095385; Tue, 30 May 2017 04:42:36 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201705300442.v4U4gaik095385@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 30 May 2017 04:42:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r319189 - in stable/11/secure: . lib lib/libcrypto lib/libcrypto/engines lib/libssh X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2017 04:42:38 -0000 Author: ngie Date: Tue May 30 04:42:36 2017 New Revision: 319189 URL: https://svnweb.freebsd.org/changeset/base/319189 Log: MFC r314658: crypto: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output Modified: stable/11/secure/Makefile stable/11/secure/Makefile.inc stable/11/secure/lib/Makefile.inc stable/11/secure/lib/libcrypto/Makefile.inc stable/11/secure/lib/libcrypto/engines/Makefile.inc stable/11/secure/lib/libssh/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/secure/Makefile ============================================================================== --- stable/11/secure/Makefile Tue May 30 04:36:11 2017 (r319188) +++ stable/11/secure/Makefile Tue May 30 04:42:36 2017 (r319189) @@ -21,7 +21,7 @@ SPROGS+=usr.sbin/sendmail # This target is used to rebuild these programs with crypto. secure: .MAKE .PHONY .for entry in ${SPROGS} - cd ${.CURDIR}/../${entry}; \ + cd ${.CURDIR:H}/${entry}; \ ${MAKE} cleandir; \ ${MAKE} obj; \ ${MAKE} all; \ @@ -31,7 +31,7 @@ secure: .MAKE .PHONY # This target is used to rebuild these programs without crypto. insecure: .MAKE .PHONY .for entry in ${SPROGS} - cd ${.CURDIR}/../${entry}; \ + cd ${.CURDIR:H}/${entry}; \ ${MAKE} MK_CRYPT=no cleandir; \ ${MAKE} MK_CRYPT=no obj; \ ${MAKE} MK_CRYPT=no all; \ Modified: stable/11/secure/Makefile.inc ============================================================================== --- stable/11/secure/Makefile.inc Tue May 30 04:36:11 2017 (r319188) +++ stable/11/secure/Makefile.inc Tue May 30 04:42:36 2017 (r319189) @@ -2,14 +2,14 @@ .include -.if exists(${.CURDIR}/../../lib/libcrypt/obj) -CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj +.if exists(${.CURDIR:H:H}/lib/libcrypt/obj) +CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt/obj .else -CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt +CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt .endif .if ${MK_OPENSSH} != "no" -SSHDIR= ${.CURDIR}/../../../crypto/openssh +SSHDIR= ${SRCTOP}/crypto/openssh .endif WARNS?= 0 Modified: stable/11/secure/lib/Makefile.inc ============================================================================== --- stable/11/secure/lib/Makefile.inc Tue May 30 04:36:11 2017 (r319188) +++ stable/11/secure/lib/Makefile.inc Tue May 30 04:42:36 2017 (r319189) @@ -1,6 +1,6 @@ # $FreeBSD$ .include "../Makefile.inc" -.if exists(${.CURDIR}/../../../lib/Makefile.inc) -.include "${.CURDIR}/../../../lib/Makefile.inc" +.if exists(${.CURDIR:H:H:H}/lib/Makefile.inc) +.include "${.CURDIR:H:H:H}/lib/Makefile.inc" .endif Modified: stable/11/secure/lib/libcrypto/Makefile.inc ============================================================================== --- stable/11/secure/lib/libcrypto/Makefile.inc Tue May 30 04:36:11 2017 (r319188) +++ stable/11/secure/lib/libcrypto/Makefile.inc Tue May 30 04:42:36 2017 (r319189) @@ -6,7 +6,7 @@ OPENSSL_VER= 1.0.2k OPENSSL_DATE= 2017-01-26 -LCRYPTO_SRC= ${.CURDIR}/../../../crypto/openssl +LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc CFLAGS+= -I${LCRYPTO_SRC} Modified: stable/11/secure/lib/libcrypto/engines/Makefile.inc ============================================================================== --- stable/11/secure/lib/libcrypto/engines/Makefile.inc Tue May 30 04:36:11 2017 (r319188) +++ stable/11/secure/lib/libcrypto/engines/Makefile.inc Tue May 30 04:42:36 2017 (r319189) @@ -1,6 +1,6 @@ # $FreeBSD$ -LCRYPTO_SRC= ${.CURDIR}/../../../../../crypto/openssl +LCRYPTO_SRC= ${SRCTOP}/crypto/openssl .PATH: ${LCRYPTO_SRC}/engines ${LCRYPTO_SRC}/engines/ccgost SHLIBDIR?= /usr/lib/engines Modified: stable/11/secure/lib/libssh/Makefile ============================================================================== --- stable/11/secure/lib/libssh/Makefile Tue May 30 04:36:11 2017 (r319188) +++ stable/11/secure/lib/libssh/Makefile Tue May 30 04:42:36 2017 (r319189) @@ -37,7 +37,7 @@ SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_b .if ${MK_LDNS} == "no" SRCS+= getrrsetbyname.c .else -LDNSDIR= ${.CURDIR}/../../../contrib/ldns +LDNSDIR= ${SRCTOP}/contrib/ldns CFLAGS+= -DHAVE_LDNS=1 -I${LDNSDIR} SRCS+= getrrsetbyname-ldns.c LIBADD+= ldns