Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Aug 2018 15:53:11 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r477965 - head/devel/llvm-devel
Message-ID:  <201808241553.w7OFrCRi040982@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Fri Aug 24 15:53:11 2018
New Revision: 477965
URL: https://svnweb.freebsd.org/changeset/ports/477965

Log:
  Fix build when the default python version isn't 2.7.
  
  The problem here is that if the default version was (e.g.) 3.6, a
  python 3.6 version of sphinx would be installed, but a python 2.7
  version of py-recommonmark would be installed and then not be found.
  Fix this problem by forcing the install of a python 2.7 version of
  sphinx.
  
  No functional change.

Modified:
  head/devel/llvm-devel/Makefile

Modified: head/devel/llvm-devel/Makefile
==============================================================================
--- head/devel/llvm-devel/Makefile	Fri Aug 24 15:31:41 2018	(r477964)
+++ head/devel/llvm-devel/Makefile	Fri Aug 24 15:53:11 2018	(r477965)
@@ -81,9 +81,10 @@ COMPILER_RT_GH_TAGNAME=	${COMPILER_RT_COMMIT}:compiler
 COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
 			${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
 DOCS_PORTDOCS=		llvm
-DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
+DOCS_BUILD_DEPENDS=	sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
 DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
+			-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
 			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
 			-DLLVM_BUILD_DOCS=ON
 DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}



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