Attachment #227714 for bug #258192

View | Details | Raw Unified | Return to bug 258192
Collapse All | Expand All




# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>

PORTNAME=	pyinstaller
PORTVERSION=	4.5.1
PORTREVISION=	1
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
DISTNAME=	pyinstaller-${PORTVERSION}

MAINTAINER=	python@FreeBSD.org
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,' \

	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 <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/py-pyinstaller/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1562773511	1	TIMESTAMP = 1630950355
2	SHA256 (PyInstaller-3.5.tar.gz) = ee7504022d1332a3324250faf2135ea56ac71fdb6309cff8cd235de26b1d0a96	2	SHA256 (pyinstaller-4.5.1.tar.gz) = 30733baaf8971902286a0ddf77e5499ac5f7bf8e7c39163e83d4f8c696ef265e
3	SIZE (PyInstaller-3.5.tar.gz) = 3518991	3	SIZE (pyinstaller-4.5.1.tar.gz) = 2720625




 
 #if defined(_WIN32)
     #define MS_WINDOWS
@@ -87,17 +89,6 @@ main(int argc, char **argv)
 {
     int res;
 
-    #ifdef __FreeBSD__
-    fp_except_t m;
-
-    /* 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__
-    m = fpgetmask();
-    fpsetmask(m & ~FP_X_OFL);
-    #endif




--- 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:

Lines 1-2 Link Here

(-)b/devel/py-pyinstaller/pkg-plist (-3 lines)
1	%%MANPAGES%%share/man/man1/pyi-makespec.1.gz
2	%%MANPAGES%%share/man/man1/pyinstaller.1.gz
3	-

Return to bug 258192

Lines 1-12 Link Here

(-)b/devel/py-pyinstaller/Makefile (-26 / +3 lines)
1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>	1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
2		2
3	PORTNAME= pyinstaller	3	PORTNAME= pyinstaller
4	PORTVERSION= 3.5	4	PORTVERSION= 4.5.1
5	PORTREVISION= 1	5	PORTREVISION= 1
6	CATEGORIES= devel python	6	CATEGORIES= devel python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
9	DISTNAME= PyInstaller-${PORTVERSION}	9	DISTNAME= pyinstaller-${PORTVERSION}
10		10
11	MAINTAINER= python@FreeBSD.org	11	MAINTAINER= python@FreeBSD.org
12	COMMENT= Program to create standalone executables from Python scripts	12	COMMENT= Program to create standalone executables from Python scripts
Lines 14-39 COMMENT= Program to create standalone executables from Python scripts Link Here
14	LICENSE= GPLv2	14	LICENSE= GPLv2
15	LICENSE_FILE= ${WRKSRC}/COPYING.txt	15	LICENSE_FILE= ${WRKSRC}/COPYING.txt
16		16
		17	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}altgraph>0:math/py-altgraph@${PY_FLAVOR}	18	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}altgraph>0:math/py-altgraph@${PY_FLAVOR}
18		19
19	USES= python:3.6+	20	USES= python:3.6+
20	USE_PYTHON= autoplist concurrent distutils	21	USE_PYTHON= autoplist concurrent distutils
21		22
22	EXTRACT_AFTER_ARGS= --exclude doc/source --no-same-owner --no-same-permissions	23	EXTRACT_AFTER_ARGS= --exclude doc/source --no-same-owner --no-same-permissions
23	DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
24	PORTDOCS= *.txt
25
26	OPTIONS_DEFINE= DOCS MANPAGES
27	OPTIONS_DEFAULT= MANPAGES
28	OPTIONS_SUB= yes
29
30	DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
31	${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
32	DOCS_MAKE_ARGS= SPHINXBUILD=sphinx-build-${PYTHON_VER}
33	DOCS_USES= gmake
34	MANPAGES_BUILD_DEPENDS= ${DOCS_BUILD_DEPENDS}
35	MANPAGES_MAKE_ARGS= ${DOCS_MAKE_ARGS}
36	MANPAGES_USES= gmake
37		24
38	post-patch:	25	post-patch:
39	@${REINPLACE_CMD} -e '/install_requires/s,distribute,setuptools,' \	26	@${REINPLACE_CMD} -e '/install_requires/s,distribute,setuptools,' \
Lines 46-59 pre-build: Link Here
46	cd ${WRKSRC}/bootloader && \	33	cd ${WRKSRC}/bootloader && \
47	${PYTHON_CMD} waf all	34	${PYTHON_CMD} waf all
48		35
49	do-install-MANPAGES-on:
50	( cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man ${MAKE_ARGS})
51	( cd ${WRKSRC}/doc/_build/man ; ${INSTALL_MAN} pyi-makespec.1 pyinstaller.1 \
52	${STAGEDIR}${PREFIX}/share/man/man1 )
53
54	do-install-DOCS-on:
55	@${MKDIR} ${STAGEDIR}${DOCSDIR}
56	(cd ${WRKSRC}/doc ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} text ${MAKE_ARGS})
57	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/doc/_build/text/\|} ${STAGEDIR}${DOCSDIR}
58
59	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Lines 22-41 Link Here

(-)b/devel/py-pyinstaller/files/patch-bootloader_src_main.c (-9 / +7 lines)
22		22
23	#if defined(_WIN32)	23	#if defined(_WIN32)
24	#define MS_WINDOWS	24	#define MS_WINDOWS
25	@@ -87,19 +89,12 @@ main(int argc, char **argv)	25	@@ -87,17 +89,6 @@ main(int argc, char **argv)
26	{	26	{
27	int res;	27	int res;
28		28
29	- #ifdef __FreeBSD__	29	- #ifdef __FreeBSD__
30	- fp_except_t m;	30	- fp_except_t m;
31	- #endif	31	-
32		32	- /* 754 requires that FP exceptions run in "no stop" mode by default,
33	/* 754 requires that FP exceptions run in "no stop" mode by default,	33	- * and until C vendors implement C99's ways to control FP exceptions,
34	* and until C vendors implement C99's ways to control FP exceptions,	34	- * Python requires non-stop mode. Alas, some platforms enable FP
35	* Python requires non-stop mode. Alas, some platforms enable FP	35	- * exceptions by default. Here we disable them.
36	* exceptions by default. Here we disable them.	36	- */
37	*/
38	- #ifdef __FreeBSD__
39	- m = fpgetmask();	37	- m = fpgetmask();
40	- fpsetmask(m & ~FP_X_OFL);	38	- fpsetmask(m & ~FP_X_OFL);
41	- #endif	39	- #endif

Removed Link Here

(-)a/devel/py-pyinstaller/files/patch-bootloader_wscript (-20 lines)
1	--- bootloader/wscript.orig 2018-09-22 05:02:42 UTC
2	+++ bootloader/wscript
3	@@ -361,7 +361,7 @@ def set_arch_flags(ctx):
4	# or vice versa or with manually choosen --target-arch.
5	# Option -m32/-m64 has to be passed to cflags and linkflages.
6	elif ctx.env.PYI_ARCH == '32bit':
7	- if machine() in ('arm', 'aarch') and ctx.env.DEST_OS == 'linux':
8	+ if ctx.env.CC_NAME == "gcc":
9	# It was reported that flag '-m32' does not work with gcc
10	# on 32-bit arm Linux. So skip the -m32 flag.
11	pass
12	@@ -377,7 +377,7 @@ def set_arch_flags(ctx):
13	if ctx.env.DEST_OS == 'win32':
14	ctx.env.append_value('LINKFLAGS', '-Wl,--large-address-aware')
15	elif ctx.env.PYI_ARCH == '64bit':
16	- if machine() in ('arm', 'aarch') and ctx.env.DEST_OS == 'linux':
17	+ if ctx.env.CC_NAME == 'gcc':
18	# flag '-m64' does not work with gcc on 64-bit arm/aarch Linux.
19	pass
20	else: