From 77fc9cd18962aae7b7fe896aaf36c89811f239ba Mon Sep 17 00:00:00 2001 From: Kubilay Kocak Date: Thu, 4 Jun 2015 06:45:37 +0000 Subject: [PATCH] lang/pypy: Fix build. Temporarily disable CFFI modules Temporarily disable CFFI module compilation post-build and the shared CFFI libraries in the packaging lists to due failures finding and linking tkinter: Building tk bindings failed. You can either install development headers package, add the --without-tk option to skip packaging this binary CFFI extension, or say --without-cffi. Traceback (most recent call last): File "/app_main.py", line 75, in run_toplevel File "/usr/ports/lang/pypy/files/compile_cffi.py", line 15, in create_cffi_import_libraries(sys.executable, Options(cffi_build_scripts), py.path.local(basedir)) File "/wrkdirs/usr/ports/lang/pypy/work/pypy-pypy-295ee98b6928/pypy/tool/release/package.py", line 84, in create_cffi_import_libraries raise MissingDependenciesError(module) MissingDependenciesError: _tkinter/tklib_build.py This change is being committed on behalf of and in leui of maintainer providing a comprehensive fix, as they are currently AFK. Reported by: hawkowl (via IRC, portsmon) Reviewed by: dbn (maintainer) Approved by: dbn (maintainer) --- lang/pypy/Makefile | 9 +++++++-- lang/pypy/pkg-plist | 14 +++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile index 77fcfaee28a8..48fa6321d4ec 100644 --- a/lang/pypy/Makefile +++ b/lang/pypy/Makefile @@ -3,6 +3,7 @@ PORTNAME= pypy DISTVERSION= 2.6.0 +PPORTREVISION= 1 CATEGORIES= lang python MASTER_SITES= https://bitbucket.org/pypy/pypy/get/ LOCAL/dbn/pypy DISTNAME= release-${DISTVERSION} @@ -36,6 +37,9 @@ OPTIONS_SINGLE_TRANS= PYTHON PYPY PYPY_MINMEM OPTIONS_DEFAULT+= PYPY_MINMEM .endif +# Disable CFFI compilation and shared libraries temporarily +PLIST_SUB+= CFFI="@comment" + CONFLICTS_INSTALL= pypy-[0-9]* ALL_TARGET= ${PYPY_NAMES} @@ -236,8 +240,9 @@ do-configure: ${CP} ${WRKDIR}/use.pypy ${PKGDEINSTALL} post-build: - ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKDIR}:${LD_LIBRARY_PATH} ${WRKDIR}/${PYPY_PRIMARY} ${FILESDIR}/compile_cffi.py - ${FIND} ${WRKDIR}/${PYPY_LIBDIR}/lib_pypy/ -name "*.pypy-${PYPY_VER:C/\.//}.so" | ${XARGS} ${STRIP_CMD} +# Disable CFFI compilation and shared libraries temporarily +# ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKDIR}:${LD_LIBRARY_PATH} ${WRKDIR}/${PYPY_PRIMARY} ${FILESDIR}/compile_cffi.py +# ${FIND} ${WRKDIR}/${PYPY_LIBDIR}/lib_pypy/ -name "*.pypy-${PYPY_VER:C/\.//}.so" | ${XARGS} ${STRIP_CMD} .for _path in ${PYPYDIRS} -${FIND} ${WRKDIR}/${_path:C/.*://}/ -type d | \ ${XARGS} -n1 ${WRKDIR}/${PYPY_PRIMARY} -m compileall -fl diff --git a/lang/pypy/pkg-plist b/lang/pypy/pkg-plist index b97c45ee9561..5456576c51b1 100644 --- a/lang/pypy/pkg-plist +++ b/lang/pypy/pkg-plist @@ -1540,7 +1540,7 @@ %%PYPY_LIBDIR%%/lib_pypy/__init__.pyc %%PYPY_LIBDIR%%/lib_pypy/_audioop_build.py %%PYPY_LIBDIR%%/lib_pypy/_audioop_build.pyc -%%PYPY_LIBDIR%%/lib_pypy/_audioop_cffi.pypy-%%PYPY_VER%%.so +%%CFFI%%%%PYPY_LIBDIR%%/lib_pypy/_audioop_cffi.pypy-%%PYPY_VER%%.so %%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.py %%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.pyc %%PYPY_LIBDIR%%/lib_pypy/_codecs_hk.py @@ -1586,7 +1586,7 @@ %%PYPY_LIBDIR%%/lib_pypy/_curses.pyc %%PYPY_LIBDIR%%/lib_pypy/_curses_build.py %%PYPY_LIBDIR%%/lib_pypy/_curses_build.pyc -%%PYPY_LIBDIR%%/lib_pypy/_curses_cffi.pypy-%%PYPY_VER%%.so +%%CFFI%%%%PYPY_LIBDIR%%/lib_pypy/_curses_cffi.pypy-%%PYPY_VER%%.so %%PYPY_LIBDIR%%/lib_pypy/_curses_panel.py %%PYPY_LIBDIR%%/lib_pypy/_curses_panel.pyc %%PYPY_LIBDIR%%/lib_pypy/_elementtree.py @@ -1597,14 +1597,14 @@ %%PYPY_LIBDIR%%/lib_pypy/_functools.pyc %%PYPY_LIBDIR%%/lib_pypy/_gdbm_build.py %%PYPY_LIBDIR%%/lib_pypy/_gdbm_build.pyc -%%PYPY_LIBDIR%%/lib_pypy/_gdbm_cffi.pypy-%%PYPY_VER%%.so +%%CFFI%%%%PYPY_LIBDIR%%/lib_pypy/_gdbm_cffi.pypy-%%PYPY_VER%%.so %%PYPY_LIBDIR%%/lib_pypy/_marshal.py %%PYPY_LIBDIR%%/lib_pypy/_marshal.pyc %%PYPY_LIBDIR%%/lib_pypy/_md5.py %%PYPY_LIBDIR%%/lib_pypy/_md5.pyc %%PYPY_LIBDIR%%/lib_pypy/_pwdgrp_build.py %%PYPY_LIBDIR%%/lib_pypy/_pwdgrp_build.pyc -%%PYPY_LIBDIR%%/lib_pypy/_pwdgrp_cffi.pypy-%%PYPY_VER%%.so +%%CFFI%%%%PYPY_LIBDIR%%/lib_pypy/_pwdgrp_cffi.pypy-%%PYPY_VER%%.so %%PYPY_LIBDIR%%/lib_pypy/_pypy_interact.py %%PYPY_LIBDIR%%/lib_pypy/_pypy_interact.pyc %%PYPY_LIBDIR%%/lib_pypy/_pypy_irc_topic.py @@ -1625,14 +1625,14 @@ %%PYPY_LIBDIR%%/lib_pypy/_sqlite3.pyc %%PYPY_LIBDIR%%/lib_pypy/_sqlite3_build.py %%PYPY_LIBDIR%%/lib_pypy/_sqlite3_build.pyc -%%PYPY_LIBDIR%%/lib_pypy/_sqlite3_cffi.pypy-%%PYPY_VER%%.so +%%CFFI%%%%PYPY_LIBDIR%%/lib_pypy/_sqlite3_cffi.pypy-%%PYPY_VER%%.so %%PYPY_LIBDIR%%/lib_pypy/_structseq.py %%PYPY_LIBDIR%%/lib_pypy/_structseq.pyc %%PYPY_LIBDIR%%/lib_pypy/_subprocess.py %%PYPY_LIBDIR%%/lib_pypy/_subprocess.pyc %%PYPY_LIBDIR%%/lib_pypy/_syslog_build.py %%PYPY_LIBDIR%%/lib_pypy/_syslog_build.pyc -%%PYPY_LIBDIR%%/lib_pypy/_syslog_cffi.pypy-%%PYPY_VER%%.so +%%CFFI%%%%PYPY_LIBDIR%%/lib_pypy/_syslog_cffi.pypy-%%PYPY_VER%%.so %%PYPY_LIBDIR%%/lib_pypy/_testcapi.py %%PYPY_LIBDIR%%/lib_pypy/_testcapi.pyc %%PYPY_LIBDIR%%/lib_pypy/_tkinter/__init__.py @@ -1644,7 +1644,7 @@ %%PYPY_LIBDIR%%/lib_pypy/_tkinter/tclobj.pyc %%PYPY_LIBDIR%%/lib_pypy/_tkinter/tklib_build.py %%PYPY_LIBDIR%%/lib_pypy/_tkinter/tklib_build.pyc -%%PYPY_LIBDIR%%/lib_pypy/_tkinter/tklib_cffi.pypy-%%PYPY_VER%%.so +%%CFFI%%%%PYPY_LIBDIR%%/lib_pypy/_tkinter/tklib_cffi.pypy-%%PYPY_VER%%.so %%PYPY_LIBDIR%%/lib_pypy/audioop.py %%PYPY_LIBDIR%%/lib_pypy/audioop.pyc %%PYPY_LIBDIR%%/lib_pypy/cPickle.py