From owner-svn-ports-all@freebsd.org Mon Aug 27 16:09:22 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C42E0108F0A6; Mon, 27 Aug 2018 16:09:22 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7958377540; Mon, 27 Aug 2018 16:09:22 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B6D91FDA5; Mon, 27 Aug 2018 16:09:22 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7RG9MMY076282; Mon, 27 Aug 2018 16:09:22 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7RG9MY2076281; Mon, 27 Aug 2018 16:09:22 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201808271609.w7RG9MY2076281@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Mon, 27 Aug 2018 16:09:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478216 - head/net/ceph X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: head/net/ceph X-SVN-Commit-Revision: 478216 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Aug 2018 16:09:22 -0000 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