From owner-svn-ports-all@FreeBSD.ORG Fri May 15 17:04:55 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 015F1680; Fri, 15 May 2015 17:04:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 C92A216D8; Fri, 15 May 2015 17:04:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4FH4siJ055426; Fri, 15 May 2015 17:04:54 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4FH4sP9055425; Fri, 15 May 2015 17:04:54 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201505151704.t4FH4sP9055425@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 15 May 2015 17:04:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386439 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2015 17:04:55 -0000 Author: jkim Date: Fri May 15 17:04:54 2015 New Revision: 386439 URL: https://svnweb.freebsd.org/changeset/ports/386439 Log: - Do not define OPENSSLRPATH when base OpenSSL is used. Adding /usr/lib is pointless and blindly adding ${LOCALBASE}/lib after that is even harmful. - Stop hardcoding "pkg query". [1] PR: 200164 [1] Approved by: portmgr (antoine) Exp-run by: antoine Modified: head/Mk/bsd.openssl.mk Modified: head/Mk/bsd.openssl.mk ============================================================================== --- head/Mk/bsd.openssl.mk Fri May 15 17:03:13 2015 (r386438) +++ head/Mk/bsd.openssl.mk Fri May 15 17:04:54 2015 (r386439) @@ -80,7 +80,6 @@ OPENSSL_CFLAGS+= -DNO_IDEA .endif MAKE_ARGS+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" .endif -OPENSSLRPATH= /usr/lib:${LOCALBASE}/lib .else @@ -99,7 +98,7 @@ OPENSSL_INSTALLED!= ${PKG_BIN} ${PKGARGS .endif .if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" OPENSSL_PORT= ${OPENSSL_INSTALLED} -OPENSSL_SHLIBFILE!= ${PKG_INFO} -ql ${OPENSSL_INSTALLED} | grep "^`pkg query "%p" ${OPENSSL_INSTALLED}`/lib/libcrypto.so.[0-9]*$$" +OPENSSL_SHLIBFILE!= ${PKG_INFO} -ql ${OPENSSL_INSTALLED} | grep "^`${PKG_QUERY} "%p" ${OPENSSL_INSTALLED}`/lib/libcrypto.so.[0-9]*$$" OPENSSL_SHLIBVER?= ${OPENSSL_SHLIBFILE:E} .else # PKG_DBDIR was not found @@ -125,17 +124,20 @@ OPENSSLRPATH= ${LOCALBASE}/lib OPENSSLLIB= ${OPENSSLBASE}/lib OPENSSLINC= ${OPENSSLBASE}/include +MAKE_ENV+= OPENSSLBASE=${OPENSSLBASE} +MAKE_ENV+= OPENSSLDIR=${OPENSSLDIR} +MAKE_ENV+= OPENSSLINC=${OPENSSLINC} +MAKE_ENV+= OPENSSLLIB=${OPENSSLLIB} + +.if defined(OPENSSLRPATH) .if defined(USE_OPENSSL_RPATH) CFLAGS+= -Wl,-rpath,${OPENSSLRPATH} .endif +MAKE_ENV+= OPENSSLRPATH=${OPENSSLRPATH} OPENSSL_LDFLAGS+= -Wl,-rpath,${OPENSSLRPATH} +.endif -LDFLAGS+=${OPENSSL_LDFLAGS} - -MAKE_ENV+= OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \ - OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR} \ - OPENSSLRPATH=${OPENSSLRPATH} +LDFLAGS+= ${OPENSSL_LDFLAGS} ### crypto #RESTRICTED= "Contains cryptography." -