Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Aug 2018 16:09:22 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r478216 - head/net/ceph
Message-ID:  <201808271609.w7RG9MY2076281@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhale
Date: Mon Aug 27 16:09:21 2018
New Revision: 478216
URL: https://svnweb.freebsd.org/changeset/ports/478216

Log:
  Fix build when DEFAULT_VERSIONS=python=3.[4-6] is set
  
  In a python 3.x environment, the unversioned symlink to sphinx-build points
  to the python 3.x version which will cause the build to fail. This port
  can only use python 2.7, so we need to specify the version of sphinx-build.
  
  This was supposedly fixed in r467840 and the PR was closed, but I was
  informed by fluffy via private mail that it was still broken.
  
  PR:		227260
  Submitted by:	fluffy
  Approved by:	portmgr (blanket - trivial build fix)

Modified:
  head/net/ceph/Makefile

Modified: head/net/ceph/Makefile
==============================================================================
--- head/net/ceph/Makefile	Mon Aug 27 16:00:10 2018	(r478215)
+++ head/net/ceph/Makefile	Mon Aug 27 16:09:21 2018	(r478216)
@@ -100,6 +100,9 @@ USE_LDCONFIG=	yes
 USERS=		ceph
 GROUPS=		ceph
 
+post-patch:
+	${REINPLACE_CMD} 's|sphinx-build|sphinx-build-${PYTHON_VER}|g' ${WRKSRC}/CMakeLists.txt
+
 pre-configure:
 	${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build
 	${CP} files/file-git_version ${WRKSRC}/src/.git_version



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808271609.w7RG9MY2076281>