# HG changeset patch # User Franz Glasner # Date 1665313013 -7200 # Node ID af3a2629a8829f7aee01b414e54e9273309291d4 # Parent 08af0d826e3b9e60d384354d0be4dc5d0ddf854e Allow to build PyPy3.9: the target name in the generated Makefile has changed diff -r 08af0d826e3b -r af3a2629a882 Makefile --- a/Makefile Sun Oct 09 12:43:52 2022 +0200 +++ b/Makefile Sun Oct 09 12:56:53 2022 +0200 @@ -48,7 +48,7 @@ OPTIONS_SLAVE= PYTHON .endif -ALL_TARGET= ${PORTNAME}-c +ALL_TARGET= ${PYPY_EXECUTABLE} BUILD_WRKSRC?= ${WRKDIR}/build/usession-${PORTNAME}-0/testing_1 MAKE_ENV+= PYPY_LOCALBASE=${LOCALBASE} PYPY_WRKDIR=${WRKDIR} LDSHARED="${CC} -shared" PACKAGE_ARGS?= --without-gdbm --without-sqlite3 --without-_tkinter @@ -125,7 +125,7 @@ fi post-build: - ${CP} ${BUILD_WRKSRC}/${PORTNAME}-c ${BUILD_WRKSRC}/${PYPY_LDLIBRARY} ${WRKSRC}/pypy/goal/ + ${CP} ${BUILD_WRKSRC}/${PYPY_EXECUTABLE} ${BUILD_WRKSRC}/${PYPY_LDLIBRARY} ${WRKSRC}/pypy/goal/ do-install: ${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build \ diff -r 08af0d826e3b -r af3a2629a882 bsd.pypy.mk --- a/bsd.pypy.mk Sun Oct 09 12:43:52 2022 +0200 +++ b/bsd.pypy.mk Sun Oct 09 12:56:53 2022 +0200 @@ -20,6 +20,7 @@ PY_VERSION_SHORT= 2.7 PYPY_CFFI_VER= ${PYTHON_IMPL}-73 PYPY_LDLIBRARY= libpypy-c.so +PYPY_EXECUTABLE= pypy-c .else # ${PYTHON_IMPL} == pypy3 @@ -53,12 +54,15 @@ .if ${PORT_OPTIONS:MFORPYIMPL37} PY_VERSION_SHORT= 3.7 PYPY_LDLIBRARY= libpypy3-c.so +PYPY_EXECUTABLE= pypy3-c .endif .if ${PORT_OPTIONS:MFORPYIMPL38} PY_VERSION_SHORT= 3.8 PYPY_LDLIBRARY= libpypy3-c.so +PYPY_EXECUTABLE= pypy3-c .endif .if ${PORT_OPTIONS:MFORPYIMPL39} PY_VERSION_SHORT= 3.9 PYPY_LDLIBRARY= libpypy3.9-c.so +PYPY_EXECUTABLE= pypy3.9-c .endif