Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Jun 2015 06:45:38 +0000 (UTC)
From:      Kubilay Kocak <koobs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r388494 - head/lang/pypy
Message-ID:  <201506040645.t546jc0K070423@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: koobs
Date: Thu Jun  4 06:45:37 2015
New Revision: 388494
URL: https://svnweb.freebsd.org/changeset/ports/388494

Log:
  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 "<builtin>/app_main.py", line 75, in run_toplevel
    File "/usr/ports/lang/pypy/files/compile_cffi.py", line 15, in <module>
      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)

Modified:
  head/lang/pypy/Makefile
  head/lang/pypy/pkg-plist

Modified: head/lang/pypy/Makefile
==============================================================================
--- head/lang/pypy/Makefile	Thu Jun  4 06:25:47 2015	(r388493)
+++ head/lang/pypy/Makefile	Thu Jun  4 06:45:37 2015	(r388494)
@@ -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_M
 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

Modified: head/lang/pypy/pkg-plist
==============================================================================
--- head/lang/pypy/pkg-plist	Thu Jun  4 06:25:47 2015	(r388493)
+++ head/lang/pypy/pkg-plist	Thu Jun  4 06:45:37 2015	(r388494)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506040645.t546jc0K070423>