From owner-svn-ports-head@FreeBSD.ORG Sun Dec 22 14:04:37 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ACB21978; Sun, 22 Dec 2013 14:04:37 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 993771F55; Sun, 22 Dec 2013 14:04:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBME4bk1075172; Sun, 22 Dec 2013 14:04:37 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBME4b8T075171; Sun, 22 Dec 2013 14:04:37 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201312221404.rBME4b8T075171@svn.freebsd.org> From: Max Brazhnikov Date: Sun, 22 Dec 2013 14:04:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337190 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Dec 2013 14:04:37 -0000 Author: makc Date: Sun Dec 22 14:04:37 2013 New Revision: 337190 URL: http://svnweb.freebsd.org/changeset/ports/337190 Log: - Don't remove rpath from binaries during install [1] - Remove outdated comment PR: ports/176901 [1] Submitted by: amdmi3, avg Exp-run by: bdrewery Modified: head/Mk/Uses/cmake.mk Modified: head/Mk/Uses/cmake.mk ============================================================================== --- head/Mk/Uses/cmake.mk Sun Dec 22 13:50:38 2013 (r337189) +++ head/Mk/Uses/cmake.mk Sun Dec 22 14:04:37 2013 (r337190) @@ -35,10 +35,6 @@ # Debug otherwise # CMAKE_SOURCE_PATH - Path to the source directory # Default: ${WRKSRC} -# -# Deprecated variables: -# CMAKE_OUTSOURCE - Instruct to perform an out-of-source build. -# Deprecated, use 'USES+= cmake:outsource' instead. .if !defined(_INCLUDE_USES_CMAKE_MK) _INCLUDE_USES_CMAKE_MK= yes @@ -88,7 +84,8 @@ CMAKE_ARGS+= -DCMAKE_C_COMPILER:STRING= -DCMAKE_SHARED_LINKER_FLAGS:STRING="${LDFLAGS}" \ -DCMAKE_INSTALL_PREFIX:PATH="${PREFIX}" \ -DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \ - -DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES + -DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES \ + -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=YES .if defined(BATCH) || defined(PACKAGE_BUILDING) CMAKE_VERBOSE= yes