Date: Mon, 14 Mar 2016 04:04:51 +0000 (UTC) From: David Naylor <dbn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411039 - head/lang/pypy Message-ID: <201603140404.u2E44p8T087875@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <ato@iem.pw.edu.pl> 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]*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603140404.u2E44p8T087875>