From b2a091f4a7d1cbfbc3eae603509052d85218c318 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 6 Sep 2021 11:51:54 -0600 Subject: [PATCH] Try to update pyinstaller Pyinstaller 3.5 does not work with version 3.8 of Python. This commit attempts to update the port to version 4.5.1 of Pyinstaller, which is current as of 7 Aug 2021. Unfortunately, the upstream tarballs no longer provide the doc directory and therefore I had to remove all the parts of the makefile and plist that pertain to documentation. The documentation is still available in the github repo for the project, just not the CHEESESHOP tarball. --- devel/py-pyinstaller/Makefile | 29 ++----------------- devel/py-pyinstaller/distinfo | 6 ++-- .../files/patch-bootloader_src_main.c | 16 +++++----- .../files/patch-bootloader_wscript | 20 ------------- devel/py-pyinstaller/pkg-plist | 2 -- 5 files changed, 13 insertions(+), 60 deletions(-) delete mode 100644 devel/py-pyinstaller/files/patch-bootloader_wscript diff --git a/devel/py-pyinstaller/Makefile b/devel/py-pyinstaller/Makefile index 594eb917ae93..8b66c9f15c76 100644 --- a/devel/py-pyinstaller/Makefile +++ b/devel/py-pyinstaller/Makefile @@ -1,12 +1,12 @@ # Created by: Alexey Dokuchaev PORTNAME= pyinstaller -PORTVERSION= 3.5 +PORTVERSION= 4.5.1 PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= PyInstaller-${PORTVERSION} +DISTNAME= pyinstaller-${PORTVERSION} MAINTAINER= python@FreeBSD.org COMMENT= Program to create standalone executables from Python scripts @@ -14,26 +14,13 @@ COMMENT= Program to create standalone executables from Python scripts LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING.txt +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}altgraph>0:math/py-altgraph@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils EXTRACT_AFTER_ARGS= --exclude doc/source --no-same-owner --no-same-permissions -DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} -PORTDOCS= *.txt - -OPTIONS_DEFINE= DOCS MANPAGES -OPTIONS_DEFAULT= MANPAGES -OPTIONS_SUB= yes - -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} -DOCS_MAKE_ARGS= SPHINXBUILD=sphinx-build-${PYTHON_VER} -DOCS_USES= gmake -MANPAGES_BUILD_DEPENDS= ${DOCS_BUILD_DEPENDS} -MANPAGES_MAKE_ARGS= ${DOCS_MAKE_ARGS} -MANPAGES_USES= gmake post-patch: @${REINPLACE_CMD} -e '/install_requires/s,distribute,setuptools,' \ @@ -46,14 +33,4 @@ pre-build: cd ${WRKSRC}/bootloader && \ ${PYTHON_CMD} waf all -do-install-MANPAGES-on: - ( cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man ${MAKE_ARGS}) - ( cd ${WRKSRC}/doc/_build/man ; ${INSTALL_MAN} pyi-makespec.1 pyinstaller.1 \ - ${STAGEDIR}${PREFIX}/share/man/man1 ) - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} text ${MAKE_ARGS}) - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/_build/text/|} ${STAGEDIR}${DOCSDIR} - .include diff --git a/devel/py-pyinstaller/distinfo b/devel/py-pyinstaller/distinfo index 4d4f7a6a5b41..c87614891f4a 100644 --- a/devel/py-pyinstaller/distinfo +++ b/devel/py-pyinstaller/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562773511 -SHA256 (PyInstaller-3.5.tar.gz) = ee7504022d1332a3324250faf2135ea56ac71fdb6309cff8cd235de26b1d0a96 -SIZE (PyInstaller-3.5.tar.gz) = 3518991 +TIMESTAMP = 1630950355 +SHA256 (pyinstaller-4.5.1.tar.gz) = 30733baaf8971902286a0ddf77e5499ac5f7bf8e7c39163e83d4f8c696ef265e +SIZE (pyinstaller-4.5.1.tar.gz) = 2720625 diff --git a/devel/py-pyinstaller/files/patch-bootloader_src_main.c b/devel/py-pyinstaller/files/patch-bootloader_src_main.c index 31d9b2c6b3b6..c0b2b19841fb 100644 --- a/devel/py-pyinstaller/files/patch-bootloader_src_main.c +++ b/devel/py-pyinstaller/files/patch-bootloader_src_main.c @@ -22,20 +22,18 @@ #if defined(_WIN32) #define MS_WINDOWS -@@ -87,19 +89,12 @@ main(int argc, char **argv) +@@ -87,17 +89,6 @@ main(int argc, char **argv) { int res; - #ifdef __FreeBSD__ - fp_except_t m; -- #endif - - /* 754 requires that FP exceptions run in "no stop" mode by default, - * and until C vendors implement C99's ways to control FP exceptions, - * Python requires non-stop mode. Alas, some platforms enable FP - * exceptions by default. Here we disable them. - */ -- #ifdef __FreeBSD__ +- +- /* 754 requires that FP exceptions run in "no stop" mode by default, +- * and until C vendors implement C99's ways to control FP exceptions, +- * Python requires non-stop mode. Alas, some platforms enable FP +- * exceptions by default. Here we disable them. +- */ - m = fpgetmask(); - fpsetmask(m & ~FP_X_OFL); - #endif diff --git a/devel/py-pyinstaller/files/patch-bootloader_wscript b/devel/py-pyinstaller/files/patch-bootloader_wscript deleted file mode 100644 index baea274356e0..000000000000 --- a/devel/py-pyinstaller/files/patch-bootloader_wscript +++ /dev/null @@ -1,20 +0,0 @@ ---- bootloader/wscript.orig 2018-09-22 05:02:42 UTC -+++ bootloader/wscript -@@ -361,7 +361,7 @@ def set_arch_flags(ctx): - # or vice versa or with manually choosen --target-arch. - # Option -m32/-m64 has to be passed to cflags and linkflages. - elif ctx.env.PYI_ARCH == '32bit': -- if machine() in ('arm', 'aarch') and ctx.env.DEST_OS == 'linux': -+ if ctx.env.CC_NAME == "gcc": - # It was reported that flag '-m32' does not work with gcc - # on 32-bit arm Linux. So skip the -m32 flag. - pass -@@ -377,7 +377,7 @@ def set_arch_flags(ctx): - if ctx.env.DEST_OS == 'win32': - ctx.env.append_value('LINKFLAGS', '-Wl,--large-address-aware') - elif ctx.env.PYI_ARCH == '64bit': -- if machine() in ('arm', 'aarch') and ctx.env.DEST_OS == 'linux': -+ if ctx.env.CC_NAME == 'gcc': - # flag '-m64' does not work with gcc on 64-bit arm/aarch Linux. - pass - else: diff --git a/devel/py-pyinstaller/pkg-plist b/devel/py-pyinstaller/pkg-plist index 83e7d3387f90..e69de29bb2d1 100644 --- a/devel/py-pyinstaller/pkg-plist +++ b/devel/py-pyinstaller/pkg-plist @@ -1,2 +0,0 @@ -%%MANPAGES%%share/man/man1/pyi-makespec.1.gz -%%MANPAGES%%share/man/man1/pyinstaller.1.gz -- 2.32.0