diff options
| author | dbn <dbn@FreeBSD.org> | 2017-05-04 19:08:36 +0000 |
|---|---|---|
| committer | dbn <dbn@FreeBSD.org> | 2017-05-04 19:08:36 +0000 |
| commit | 2eb578f10a8ab315f7ac3b2d57ddbd26550b9ac4 (patch) | |
| tree | 9571c0843771b09f0b1af1fc49f917ca23fa92b2 | |
| parent | 635ee3f35302a6f640cf094178045f81bf3684d6 (diff) | |
| download | FreeBSD-ports-2eb578f10a8ab315f7ac3b2d57ddbd26550b9ac4.zip FreeBSD-ports-2eb578f10a8ab315f7ac3b2d57ddbd26550b9ac4.tar.gz | |
bsd.pypy.cffi.mk: unbreak building of cffi ports
To fix conflicting of pypy and pypy3 the PYPY_DIR value was set using
${PORTNAME}, however the same codepath is used for cffi ports who's
${PORTNAME} is not pypy or pypy3.
Fix this by using an intermediate PYTHON_IMPL variable that is conditionally
set to ${PORTNAME} and explicitly set to 'pypy' for cffi ports.
Reported by: pkg-fallout
| -rw-r--r-- | lang/pypy/bsd.pypy.cffi.mk | 3 | ||||
| -rw-r--r-- | lang/pypy/bsd.pypy.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lang/pypy/bsd.pypy.cffi.mk b/lang/pypy/bsd.pypy.cffi.mk index 8cd499b..f4363e5 100644 --- a/lang/pypy/bsd.pypy.cffi.mk +++ b/lang/pypy/bsd.pypy.cffi.mk @@ -10,9 +10,10 @@ PLIST_FILES= %%PYPY_DIR%%/lib_pypy/${CFFI_MODULE}_cffi.%%PYPY_CFFI_VER%%.so CFFI_MODULE?= _${PORTNAME} +PYTHON_IMPL= pypy PYTHON_PORTVERSION?= 5.7.1 PYTHON_PKGNAMEPREFIX= pypy- -PYTHON_CMD= ${LOCALBASE}/bin/pypy +PYTHON_CMD= ${LOCALBASE}/bin/${PYTHON_IMPL} .include "${.CURDIR}/../../lang/pypy/bsd.pypy.mk" diff --git a/lang/pypy/bsd.pypy.mk b/lang/pypy/bsd.pypy.mk index e4b67bf..6ea3363 100644 --- a/lang/pypy/bsd.pypy.mk +++ b/lang/pypy/bsd.pypy.mk @@ -7,6 +7,7 @@ LICENSE_COMB= multi USES+= compiler:c11 -PYPY_DIR= ${PORTNAME}-${PORTVERSION:C|([0-9])\.([0-9]).*|\1.\2|} +PYTHON_IMPL?= ${PORTNAME} +PYPY_DIR= ${PYTHON_IMPL}-${PORTVERSION:C|([0-9])\.([0-9]).*|\1.\2|} PYPY_CFFI_VER?= pypy-41 PLIST_SUB+= PYPY_DIR=${PYPY_DIR} PYPY_CFFI_VER=${PYPY_CFFI_VER} |
