svn commit: r337190 - head/Mk/Uses

Max Brazhnikov makc at FreeBSD.org
Sun Dec 22 14:04:37 UTC 2013


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


More information about the svn-ports-head mailing list