On Thu, Apr 07, 2016 at 12:35:33PM +0000, Christian Weisgerber wrote:
> Let's get rid of the gettext module while here.
Thanks, here's the updated diff with this change:
Index: Makefile
===================================================================
RCS file: /home/edd/cvsync/ports/lang/pypy/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 26 Mar 2016 12:11:51 -0000 1.20
+++ Makefile 8 Apr 2016 08:46:03 -0000
@@ -13,8 +13,8 @@ COMMENT = fast implementation of the Py
# * Set BOOTSTRAP_V back to ${V} in the port Makefile
# * make bootstrap && make makesum (note, FLAVOR no longer set)
# * Try the build using the bootstrap
-V = 4.0.1
-BOOTSTRAP_V = ${V}-1
+V = 5.0.1
+BOOTSTRAP_V = ${V}
DISTNAME = pypy-${V}-src
PKGNAME = pypy-${V}
BOOTSTRAP-amd64 = pypy-bootstrap-amd64-${BOOTSTRAP_V}.tar.xz
@@ -28,8 +28,9 @@ MAINTAINER = Edd Barrett <edd@openbsd.o
# PyPy is MIT; the Python libs it comes with have the same license as Python
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += bz2 c crypto curses expat ffi gdbm m ncurses panel
-WANTLIB += pthread sqlite3 ssl ${MODTCL_LIB} ${MODTK_LIB} util z
+WANTLIB += bz2 c crypto curses expat ffi gdbm iconv intl m
+WANTLIB += ncurses panel pthread sqlite3 ssl ${MODTCL_LIB}
+WANTLIB += ${MODTK_LIB} util z
MASTER_SITES = https://bitbucket.org/pypy/pypy/downloads/
MASTER_SITES0 = https://spacehopper.org/mirrors/
@@ -46,7 +47,7 @@ DISTFILES += ${BOOTSTRAP-${MACHINE_ARCH
# if adding archs, list *all* bootstraps in SUPDISTFILES
SUPDISTFILES = ${BOOTSTRAP-amd64}:0
-MODULES += devel/gettext lang/python gcc4 lang/tcl x11/tk
+MODULES += lang/python gcc4 lang/tcl x11/tk
MODPY_VERSION = 2.7
MODGCC4_ARCHS = *
MODGCC4_LANGS = c
@@ -77,17 +78,6 @@ pre-configure:
# prevent crap in the plist
rm ${WRKSRC}/lib_pypy/_tkinter/tklib_build.py.beforesubst
-# When updating the port, see pypy/tool/release/package.py and check for
-# new modules which require a cffi cache. In post-fake we must mimic
-# the function create_cffi_import_libraries().
-CFFI_CACHES = _sqlite3_build.py \
- _audioop_build.py \
- _tkinter/tklib_build.py \
- _curses_build.py \
- _syslog_build.py \
- _gdbm_build.py \
- _pwdgrp_build.py
-
do-build:
.if ${FLAVOR:Mno_bootstrap}
cd ${WRKSRC}/pypy/goal/ && ${SETENV} ${MAKE_ENV} \
@@ -125,16 +115,13 @@ do-install:
${PYPY_LD_LIBRARY_PATH} sh -c \
'find ${PREFIX}/pypy/lib-python/2.7 -name "*.py" | grep -v test
\
| xargs ${PREFIX}/pypy/bin/pypy -m compileall'
- find ${PREFIX}/pypy/lib_pypy/ -name '*.c' -or -name '*.o' | xargs rm
# make cffi shared objects
-.for i in ${CFFI_CACHES}
- cd ${WRKSRC}/lib_pypy && ${PYPY_LD_LIBRARY_PATH} \
+ cd ${WRKSRC} && ${PYPY_LD_LIBRARY_PATH} \
LDFLAGS=-L${LOCALBASE}/lib \
CPPFLAGS=-I${LOCALBASE}/include \
- ${PREFIX}/pypy/bin/pypy ${i}
-.endfor
- cp ${WRKSRC}/lib_pypy/*.so ${PREFIX}/pypy/lib_pypy/
- cp ${WRKSRC}/lib_pypy/_tkinter/*.so ${PREFIX}/pypy/lib_pypy/_tkinter/
+ PYTHONPATH=`pwd` \
+ ${PREFIX}/pypy/bin/pypy pypy/tool/build_cffi_imports.py
+ find ${PREFIX}/pypy/lib_pypy/ -name '*.c' -or -name '*.o' | xargs rm
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/pypy/lib_pypy
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/pypy/lib-python/2.7
cd ${PREFIX}/bin && ln -s ../pypy/bin/pypy
Index: distinfo
===================================================================
RCS file: /home/edd/cvsync/ports/lang/pypy/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 26 Mar 2016 12:11:51 -0000 1.13
+++ distinfo 5 Apr 2016 20:33:51 -0000
@@ -1,4 +1,4 @@
-SHA256 (pypy/pypy-4.0.1-src.tar.bz2) =
KfWqa6F7NP2YDoUXLf60CG/cNzrTkrH+/yZ30tiuojw=
-SHA256 (pypy/pypy-bootstrap-amd64-4.0.1-1.tar.xz) =
Bm88Xa/dt4WWEmeG+ssqxKTLUQKmrK8cxD8FWWqdoSo=
-SIZE (pypy/pypy-4.0.1-src.tar.bz2) = 17172844
-SIZE (pypy/pypy-bootstrap-amd64-4.0.1-1.tar.xz) = 22443604
+SHA256 (pypy/pypy-5.0.1-src.tar.bz2) =
FXPJKE0+wjbI5u87lUdTky3/KUYsVLWIW3YdHuaLbgU=
+SHA256 (pypy/pypy-bootstrap-amd64-5.0.1.tar.xz) =
ycA79La+8cKOLaLFAmMsE5G/UU/E5R/ObLIniSR29Iw=
+SIZE (pypy/pypy-5.0.1-src.tar.bz2) = 17282149
+SIZE (pypy/pypy-bootstrap-amd64-5.0.1.tar.xz) = 22773620
Index: patches/patch-lib_pypy__tkinter_tklib_build_py
===================================================================
RCS file:
/home/edd/cvsync/ports/lang/pypy/patches/patch-lib_pypy__tkinter_tklib_build_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_pypy__tkinter_tklib_build_py
--- patches/patch-lib_pypy__tkinter_tklib_build_py 27 Aug 2015 14:21:32
-0000 1.1
+++ patches/patch-lib_pypy__tkinter_tklib_build_py 5 Apr 2016 13:41:47
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-lib_pypy__tkinter_tklib_build_py,v 1.1 2015/08/27 14:21:32 edd
Exp $
---- lib_pypy/_tkinter/tklib_build.py.orig Mon Mar 23 16:17:54 2015
-+++ lib_pypy/_tkinter/tklib_build.py Thu Apr 2 19:25:50 2015
-@@ -119,9 +119,9 @@ void Tcl_FindExecutable(char *argv0);
+--- lib_pypy/_tkinter/tklib_build.py.orig Fri Mar 18 17:52:25 2016
++++ lib_pypy/_tkinter/tklib_build.py Tue Apr 5 14:40:36 2016
+@@ -6,9 +6,9 @@ import sys, os
# XXX find a better way to detect paths
# XXX pick up CPPFLAGS and LDFLAGS and add to these paths?
if sys.platform.startswith("openbsd"):
Index: patches/patch-rpython_rlib_rvmprof_src_vmprof_config_h
===================================================================
RCS file: patches/patch-rpython_rlib_rvmprof_src_vmprof_config_h
diff -N patches/patch-rpython_rlib_rvmprof_src_vmprof_config_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-rpython_rlib_rvmprof_src_vmprof_config_h 5 Apr 2016
13:44:00 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- rpython/rlib/rvmprof/src/vmprof_config.h.orig Fri Mar 18 17:52:25 2016
++++ rpython/rlib/rvmprof/src/vmprof_config.h Tue Apr 5 14:43:56 2016
+@@ -1,6 +1,10 @@
++#if !defined(__OpenBSD__)
+ #define HAVE_SYS_UCONTEXT_H
++#endif
+ #if defined(__FreeBSD__) || defined(__APPLE__)
+ #define PC_FROM_UCONTEXT uc_mcontext.mc_rip
++#elif defined(__OpenBSD__)
++#define PC_FROM_UCONTEXT sc_rip
+ #else
+ #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
+ #endif
Index: patches/patch-rpython_rlib_rvmprof_src_vmprof_getpc_h
===================================================================
RCS file: patches/patch-rpython_rlib_rvmprof_src_vmprof_getpc_h
diff -N patches/patch-rpython_rlib_rvmprof_src_vmprof_getpc_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-rpython_rlib_rvmprof_src_vmprof_getpc_h 5 Apr 2016
13:41:58 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- rpython/rlib/rvmprof/src/vmprof_getpc.h.orig Tue Apr 5 14:40:47 2016
++++ rpython/rlib/rvmprof/src/vmprof_getpc.h Tue Apr 5 14:41:21 2016
+@@ -66,6 +66,8 @@
+ #elif defined(HAVE_CYGWIN_SIGNAL_H)
+ #include <cygwin/signal.h>
+ typedef ucontext ucontext_t;
++#elif defined(__OpenBSD__)
++#include <signal.h>
+ #endif
+
+
Index: pkg/PLIST
===================================================================
RCS file: /home/edd/cvsync/ports/lang/pypy/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 20 Jan 2016 14:05:12 -0000 1.9
+++ pkg/PLIST 6 Apr 2016 06:35:23 -0000
@@ -49,6 +49,7 @@ pypy/include/pymem.h
pypy/include/pyport.h
pypy/include/pypy_decl.h
pypy/include/pypy_macros.h
+pypy/include/pypy_structmember_decl.h
pypy/include/pysignals.h
pypy/include/pystate.h
pypy/include/pythonrun.h
@@ -2155,10 +2156,12 @@ pypy/lib-python/2.7/test/badsyntax_futur
pypy/lib-python/2.7/test/badsyntax_nocaret.py
pypy/lib-python/2.7/test/buffer_tests.py
pypy/lib-python/2.7/test/capath/
+pypy/lib-python/2.7/test/capath/0e4015b9.0
pypy/lib-python/2.7/test/capath/4e1295a3.0
pypy/lib-python/2.7/test/capath/5ed36f99.0
pypy/lib-python/2.7/test/capath/6e88d7b8.0
pypy/lib-python/2.7/test/capath/99d0fa06.0
+pypy/lib-python/2.7/test/capath/ce7b8643.0
pypy/lib-python/2.7/test/cfgparser.1
pypy/lib-python/2.7/test/check_soundcard.vbs
pypy/lib-python/2.7/test/cjkencodings/
@@ -2366,7 +2369,6 @@ pypy/lib-python/2.7/test/fork_wait.py
pypy/lib-python/2.7/test/formatfloat_testcases.txt
pypy/lib-python/2.7/test/gdb_sample.py
pypy/lib-python/2.7/test/greyrgb.uue
-pypy/lib-python/2.7/test/https_svn_python_org_root.pem
pypy/lib-python/2.7/test/ieee754.txt
pypy/lib-python/2.7/test/imghdrdata/
pypy/lib-python/2.7/test/imghdrdata/python.bmp
@@ -3017,7 +3019,7 @@ pypy/lib_pypy/__init__.py
pypy/lib_pypy/__init__.pyc
pypy/lib_pypy/_audioop_build.py
pypy/lib_pypy/_audioop_build.pyc
-pypy/lib_pypy/_audioop_cffi.pypy-26.so
+pypy/lib_pypy/_audioop_cffi.pypy-41.so
pypy/lib_pypy/_codecs_cn.py
pypy/lib_pypy/_codecs_cn.pyc
pypy/lib_pypy/_codecs_hk.py
@@ -3064,7 +3066,7 @@ pypy/lib_pypy/_curses.py
pypy/lib_pypy/_curses.pyc
pypy/lib_pypy/_curses_build.py
pypy/lib_pypy/_curses_build.pyc
-pypy/lib_pypy/_curses_cffi.pypy-26.so
+pypy/lib_pypy/_curses_cffi.pypy-41.so
pypy/lib_pypy/_curses_panel.py
pypy/lib_pypy/_curses_panel.pyc
pypy/lib_pypy/_elementtree.py
@@ -3075,14 +3077,14 @@ pypy/lib_pypy/_functools.py
pypy/lib_pypy/_functools.pyc
pypy/lib_pypy/_gdbm_build.py
pypy/lib_pypy/_gdbm_build.pyc
-pypy/lib_pypy/_gdbm_cffi.pypy-26.so
+pypy/lib_pypy/_gdbm_cffi.pypy-41.so
pypy/lib_pypy/_marshal.py
pypy/lib_pypy/_marshal.pyc
pypy/lib_pypy/_md5.py
pypy/lib_pypy/_md5.pyc
pypy/lib_pypy/_pwdgrp_build.py
pypy/lib_pypy/_pwdgrp_build.pyc
-pypy/lib_pypy/_pwdgrp_cffi.pypy-26.so
+pypy/lib_pypy/_pwdgrp_cffi.pypy-41.so
pypy/lib_pypy/_pypy_interact.py
pypy/lib_pypy/_pypy_interact.pyc
pypy/lib_pypy/_pypy_irc_topic.py
@@ -3103,19 +3105,23 @@ pypy/lib_pypy/_sqlite3.py
pypy/lib_pypy/_sqlite3.pyc
pypy/lib_pypy/_sqlite3_build.py
pypy/lib_pypy/_sqlite3_build.pyc
-pypy/lib_pypy/_sqlite3_cffi.pypy-26.so
+pypy/lib_pypy/_sqlite3_cffi.pypy-41.so
pypy/lib_pypy/_structseq.py
pypy/lib_pypy/_structseq.pyc
pypy/lib_pypy/_subprocess.py
pypy/lib_pypy/_subprocess.pyc
pypy/lib_pypy/_syslog_build.py
pypy/lib_pypy/_syslog_build.pyc
-pypy/lib_pypy/_syslog_cffi.pypy-26.so
+pypy/lib_pypy/_syslog_cffi.pypy-41.so
pypy/lib_pypy/_testcapi.py
pypy/lib_pypy/_testcapi.pyc
pypy/lib_pypy/_tkinter/
pypy/lib_pypy/_tkinter/__init__.py
pypy/lib_pypy/_tkinter/__init__.pyc
+pypy/lib_pypy/_tkinter/__pycache__/
+pypy/lib_pypy/_tkinter/__pycache__/_cffi__g15c874e3x76499050.pypy-41.so
+pypy/lib_pypy/_tkinter/__pycache__/_tkinter/
+pypy/lib_pypy/_tkinter/__pycache__/_tkinter/__pycache__/
pypy/lib_pypy/_tkinter/app.py
pypy/lib_pypy/_tkinter/app.pyc
pypy/lib_pypy/_tkinter/license.terms
@@ -3123,7 +3129,7 @@ pypy/lib_pypy/_tkinter/tclobj.py
pypy/lib_pypy/_tkinter/tclobj.pyc
pypy/lib_pypy/_tkinter/tklib_build.py
pypy/lib_pypy/_tkinter/tklib_build.pyc
-pypy/lib_pypy/_tkinter/tklib_cffi.pypy-26.so
+pypy/lib_pypy/_tkinter/tklib_cffi.pypy-41.so
pypy/lib_pypy/audioop.py
pypy/lib_pypy/audioop.pyc
pypy/lib_pypy/cPickle.py
@@ -3142,6 +3148,7 @@ pypy/lib_pypy/cffi.egg-info/top_level.tx
pypy/lib_pypy/cffi/__init__.py
pypy/lib_pypy/cffi/__init__.pyc
pypy/lib_pypy/cffi/_cffi_include.h
+pypy/lib_pypy/cffi/_embedding.h
pypy/lib_pypy/cffi/_pycparser/
pypy/lib_pypy/cffi/_pycparser/README
pypy/lib_pypy/cffi/_pycparser/__init__.py
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
