Date: Fri, 15 May 2015 17:04:54 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386439 - head/Mk Message-ID: <201505151704.t4FH4sP9055425@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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." -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505151704.t4FH4sP9055425>