svn commit: r394861 - head/Mk/Uses

Raphael Kubo da Costa rakuco at FreeBSD.org
Thu Aug 20 12:51:51 UTC 2015


Author: rakuco
Date: Thu Aug 20 12:51:50 2015
New Revision: 394861
URL: https://svnweb.freebsd.org/changeset/ports/394861

Log:
  Uses/localbase.mk: Set CMAKE_PREFIX_PATH.
  
  When USE'ing localbase.mk, make sure CMake is also aware that it is supposed
  to give preference to ${LOCALBASE} when looking for files and libraries.
  
  This is going to be a requirement once CMake is updated to 3.3.x, as
  starting with this version it will by default use the PATH environment
  variable (stripping the "/bin" or "/sbin" parts of each entry) to determine
  where to find files and libraries. Since in most cases /usr will come before
  /usr/local, it will find base's libarchive and fail at the configuration
  stage on older FreeBSD releases.
  
  Approved by:	portmgr (antoine)
  Differential Revision:	https://reviews.freebsd.org/D3361

Modified:
  head/Mk/Uses/localbase.mk

Modified: head/Mk/Uses/localbase.mk
==============================================================================
--- head/Mk/Uses/localbase.mk	Thu Aug 20 12:36:25 2015	(r394860)
+++ head/Mk/Uses/localbase.mk	Thu Aug 20 12:51:50 2015	(r394861)
@@ -15,4 +15,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+
+# Use CONFIGURE_ENV instead of CMAKE_ARGS because devel/cmake itself also needs
+# this, and CMAKE_ARGS is not used when bootstrapping CMake.
+CONFIGURE_ENV+=	CMAKE_PREFIX_PATH="${LOCALBASE}"
 .endif


More information about the svn-ports-head mailing list