From owner-svn-ports-all@freebsd.org Mon Mar 14 04:04:53 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B8BBAD000B; Mon, 14 Mar 2016 04:04:53 +0000 (UTC) (envelope-from dbn@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 mx1.freebsd.org (Postfix) with ESMTPS id E08CEC0F; Mon, 14 Mar 2016 04:04:52 +0000 (UTC) (envelope-from dbn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2E44pqd087876; Mon, 14 Mar 2016 04:04:51 GMT (envelope-from dbn@FreeBSD.org) Received: (from dbn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2E44p8T087875; Mon, 14 Mar 2016 04:04:51 GMT (envelope-from dbn@FreeBSD.org) Message-Id: <201603140404.u2E44p8T087875@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbn set sender to dbn@FreeBSD.org using -f From: David Naylor Date: Mon, 14 Mar 2016 04:04:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411039 - head/lang/pypy X-SVN-Group: ports-head 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.21 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, 14 Mar 2016 04:04:53 -0000 Author: dbn Date: Mon Mar 14 04:04:51 2016 New Revision: 411039 URL: https://svnweb.freebsd.org/changeset/ports/411039 Log: lang/pypy: unbreak build when pypy isn't installed. When pypy isn't installed then the port needs to use python to translate pypy, however all options are not specified since two of the three (the pypy related options) are not valid. Overcome this by a bit of re-ordering and abusing OPTIONS_SLAVE in the later case. Reported by: Andrzej Tobola Modified: head/lang/pypy/Makefile Modified: head/lang/pypy/Makefile ============================================================================== --- head/lang/pypy/Makefile Mon Mar 14 03:28:06 2016 (r411038) +++ head/lang/pypy/Makefile Mon Mar 14 04:04:51 2016 (r411039) @@ -19,15 +19,18 @@ TEST_DEPENDS= ${PREFIX}/${PYPY_DIR}/lib_ ONLY_FOR_ARCHS= i386 amd64 armv6 powerpc64 ONLY_FOR_ARCHS_REASON= PyPy JIT only supported on these architectures +OPTIONS_SINGLE= TRANS +OPTIONS_SINGLE_TRANS= PYTHON PYTHON_DESC= Use Python-2.7 to translate (slowest) PYPY_DESC= Use PyPy to translate (fastest, highest memory usage) PYPY_MINMEM_DESC= Use PyPy to translate (lowest memory usage) TRANS_DESC= Translation method LOCALBASE?= /usr/local .if exists(${LOCALBASE}/bin/pypy) -OPTIONS_SINGLE= TRANS -OPTIONS_SINGLE_TRANS= PYTHON PYPY PYPY_MINMEM -OPTIONS_DEFAULT+= PYPY_MINMEM +OPTIONS_DEFAULT= PYPY_MINMEM +OPTIONS_SINGLE_TRANS+= PYPY PYPY_MINMEM +.else +OPTIONS_SLAVE= PYTHON .endif CONFLICTS_INSTALL= pypy3-[0-9]*