Attachment 211985 Details for Bug 244463 – revised patch

revised patch

python37-p1.diff.txt (text/plain), 1.62 KB, created by Wen Heping on 2020-02-27 08:18:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wen Heping

Created: 2020-02-27 08:18:43 UTC

Size: 1.62 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 527236)
>+++ Makefile	(working copy)
>@@ -14,6 +14,8 @@
> 
> LICENSE=	PSFL
> 
>+LIB_DEPENDS=	libffi.so:devel/libffi
>+
> USES=		cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz
> PATHFIX_MAKEFILEIN=	Makefile.pre.in
> USE_LDCONFIG=	yes
>@@ -46,13 +48,12 @@
> 			XYZDOT=${PORTVERSION} \
> 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
> 
>-OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC
>-OPTIONS_DEFAULT=	LIBFFI PYMALLOC
>+OPTIONS_DEFINE=		DEBUG IPV6 NLS PYMALLOC
>+OPTIONS_DEFAULT=	PYMALLOC
> OPTIONS_RADIO=		HASH
> OPTIONS_RADIO_HASH=	FNV SIPHASH
> OPTIONS_SUB=		yes
> 
>-LIBFFI_DESC=		Use libffi from ports instead of bundled version
> NLS_DESC=		Enable gettext support for the locale module
> PYMALLOC_DESC=		Enable specialized mallocs
> 
>@@ -66,9 +67,6 @@
> DEBUG_CONFIGURE_WITH=	pydebug
> IPV6_CONFIGURE_ENABLE=	ipv6
> 
>-LIBFFI_CONFIGURE_ON=	--with-system-ffi
>-LIBFFI_LIB_DEPENDS=	libffi.so:devel/libffi
>-
> # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
> # to break in Python 2.7, or preprocessor complaints in Python >= 3.3
> # Upstream Issue: https://bugs.python.org/issue6299
>@@ -96,12 +94,6 @@
> 		libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.pc
> .endif
> 
>-# https://bugs.python.org/issue22521
>-# https://bugs.python.org/issue23042
>-.if ${ARCH} == i386 && !${PORT_OPTIONS:MLIBFFI}
>-BROKEN=		You must use libffi from ports on i386. Enable the LIBFFI option
>-.endif
>-
> .if ${ARCH} == sparc64
> CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
> .endif

Actions: View

Attachments on bug 244463: 211984 | 211985