diff options
| author | David Naylor <dbn@FreeBSD.org> | 2015-12-13 13:16:31 +0000 |
|---|---|---|
| committer | David Naylor <dbn@FreeBSD.org> | 2015-12-13 13:16:31 +0000 |
| commit | 975bf27a8f7f5b32486c9fcde365d634a135a65b (patch) | |
| tree | eb1343333fc0cbae9958cb22d68195b8487a264b | |
| parent | Fix plist after gtk20 update to 2.24.29. (diff) | |
lang/pypy: unbreak build on i386 and armv6
- Add back PYPY_BITS as it is required to define the names of two files,
depending if pypy is translated for 32 or 64 bit systems [1].
- Change maintainership to python@ [2][3][4]
Reported by: pkg-fallout [1]
Approved by: koobs@ [2]
PR: 204743 [3]
Submitted by: robak@ [4]
Notes
Notes:
svn path=/head/; revision=403664
| -rw-r--r-- | databases/pypy-gdbm/Makefile | 2 | ||||
| -rw-r--r-- | databases/pypy-sqlite3/Makefile | 2 | ||||
| -rw-r--r-- | lang/pypy/Makefile | 12 | ||||
| -rw-r--r-- | lang/pypy/pkg-plist | 4 | ||||
| -rw-r--r-- | x11-toolkits/pypy-tkinter/Makefile | 2 |
5 files changed, 15 insertions, 7 deletions
diff --git a/databases/pypy-gdbm/Makefile b/databases/pypy-gdbm/Makefile index 821ccdaa10dc..e85b50d1c59e 100644 --- a/databases/pypy-gdbm/Makefile +++ b/databases/pypy-gdbm/Makefile @@ -5,7 +5,7 @@ PORTNAME= gdbm PORTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= databases python -MAINTAINER= dbn@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT= PyPy bindings to the GNU dbm library LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm diff --git a/databases/pypy-sqlite3/Makefile b/databases/pypy-sqlite3/Makefile index cf4fb55a5da7..f40f06567eec 100644 --- a/databases/pypy-sqlite3/Makefile +++ b/databases/pypy-sqlite3/Makefile @@ -5,7 +5,7 @@ PORTNAME= sqlite3 PORTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= databases python -MAINTAINER= dbn@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT= Standard PyPy binding to the SQLite3 library LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile index 4f48a4a31691..aa7a01a6fd50 100644 --- a/lang/pypy/Makefile +++ b/lang/pypy/Makefile @@ -8,13 +8,13 @@ MASTER_SITES= https://bitbucket.org/pypy/pypy/get/ LOCAL/dbn/pypy DISTNAME= release-${DISTVERSION} DIST_SUBDIR= pypy -MAINTAINER= dbn@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT= Fast, compliant implementation of the Python language LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libffi.so:${PORTSDIR}/devel/libffi -ONLY_FOR_ARCHS= i386 amd64 armv6 +ONLY_FOR_ARCHS= i386 amd64 armv6 powerpc64 ONLY_FOR_ARCHS_REASON= PyPy JIT only supported on these architectures PYTHON_DESC= Use Python-2.7 to translate (slowest) @@ -48,6 +48,13 @@ PYTHON_CMD?= ${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_ USES+= python:2,build .endif +.if ${ARCH} == "i386" || ${ARCH} == "armv6" +PYPY_BITS= 32 +.elif ${ARCH} == "amd64" || ${ARCH} == "powerpc64" +PYPY_BITS= 64 +.endif +PLIST_SUB+= PYPY_BITS="${PYPY_BITS}" + pre-build: if [ ! -f ${BUILD_WRKSRC}/Makefile ]; then \ ${RM} -r ${WRKDIR}/build; \ @@ -86,6 +93,7 @@ regression-test: build pkg-plist: build ${TAR} -tf ${WRKDIR}/build/${PYPY_DIR}.tar.bz2 > ${WRKDIR}/.plist-files-gen ${REINPLACE_CMD} -e 's|^${PYPY_DIR}|%%PYPY_DIR%%|g' \ + -e 's|_${PYPY_BITS}_|_%%PYPY_BITS%%_|g' \ -e 's|-${PYPY_CFFI_VER}|-%%PYPY_CFFI_VER%%|g' \ -e '/\/$$/d' \ ${WRKDIR}/.plist-files-gen diff --git a/lang/pypy/pkg-plist b/lang/pypy/pkg-plist index e7215cc16f3e..e650e3010d46 100644 --- a/lang/pypy/pkg-plist +++ b/lang/pypy/pkg-plist @@ -2145,9 +2145,9 @@ bin/pypy %%PYPY_DIR%%/lib_pypy/cffi/vengine_gen.py %%PYPY_DIR%%/lib_pypy/cffi/verifier.py %%PYPY_DIR%%/lib_pypy/ctypes_config_cache/__init__.py -%%PYPY_DIR%%/lib_pypy/ctypes_config_cache/_locale_64_.py +%%PYPY_DIR%%/lib_pypy/ctypes_config_cache/_locale_%%PYPY_BITS%%_.py %%PYPY_DIR%%/lib_pypy/ctypes_config_cache/_locale_cache.py -%%PYPY_DIR%%/lib_pypy/ctypes_config_cache/_resource_64_.py +%%PYPY_DIR%%/lib_pypy/ctypes_config_cache/_resource_%%PYPY_BITS%%_.py %%PYPY_DIR%%/lib_pypy/ctypes_config_cache/_resource_cache.py %%PYPY_DIR%%/lib_pypy/ctypes_config_cache/dumpcache.py %%PYPY_DIR%%/lib_pypy/ctypes_config_cache/locale.ctc.py diff --git a/x11-toolkits/pypy-tkinter/Makefile b/x11-toolkits/pypy-tkinter/Makefile index 47ace98f149f..563e3ef2c19a 100644 --- a/x11-toolkits/pypy-tkinter/Makefile +++ b/x11-toolkits/pypy-tkinter/Makefile @@ -5,7 +5,7 @@ PORTNAME= tkinter PORTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= x11-toolkits python -MAINTAINER= dbn@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT= PyPy bindings to the Tk widget set USES= tk |