Attachment 144704 Details for Bug 191888 – Patch to remove the PTH option

[patch] Patch to remove the PTH option

python27-pth.diff (text/plain), 1.50 KB, created by Jung-uk Kim on 2014-07-15 21:20:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2014-07-15 21:20:57 UTC

Size: 1.50 KB

patch

obsolete

>Index: lang/python27/Makefile
>===================================================================
>--- lang/python27/Makefile	(revision 361997)
>+++ lang/python27/Makefile	(working copy)
>@@ -53,7 +53,7 @@ BINLINKS_SUB_TMPL=	-e 's,smtpd,smtpd%%VERSION%%,'
> 			-e 's,(idle|pydoc|python-shared|python),\1%%VERSION%%,'
> BINLINKS_SUB_PYTHON_VER=	${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_VER}/g}
> 
>-OPTIONS_DEFINE=		EXAMPLES FPECTL IPV6 NLS PTH PYMALLOC SEM THREADS
>+OPTIONS_DEFINE=		EXAMPLES FPECTL IPV6 NLS PYMALLOC SEM THREADS
> OPTIONS_DEFAULT=	IPV6 PYMALLOC SEM THREADS UCS4
> 
> OPTIONS_SINGLE=		UNICODE
>@@ -86,20 +86,9 @@ UCS4_CONFIGURE_ON=	--enable-unicode=ucs4
> 
> .if ${PORT_OPTIONS:MTHREADS}
> PLIST_SUB+=	THREADS=""
>-.if ${PORT_OPTIONS:MPTH}
>-CONFIGURE_ARGS+=	--with-pth --with-system-ffi
>-CONFIGURE_ENV+=		ac_cv_pthread=no
>-LIB_DEPENDS+=		libpth.so:${PORTSDIR}/devel/pth \
>-			libffi.so:${PORTSDIR}/devel/libffi
>-_PTH_CPPFLAGS=		"-I${LOCALBASE}/include/pth"
>-_PTH_LDFLAGS=		"-L${LOCALBASE}/lib/pth"
>-CPPFLAGS:=		${_PTH_CPPFLAGS} ${CPPFLAGS}
>-LDFLAGS+=		${_PTH_LDFLAGS}
>-.else
> CONFIGURE_ARGS+=	--with-threads
> CFLAGS+=		${PTHREAD_CFLAGS}
> LDFLAGS+=		${PTHREAD_LIBS}
>-.endif
> .else
> PLIST_SUB+=	THREADS="@comment "
> CONFIGURE_ARGS+=	--without-threads
>@@ -130,8 +119,6 @@ WITHOUT_NIS?=	detected
> PLIST_SUB+=	NO_NIS=""
> .endif
> 
>-CONFIGURE_ENV+=	OPT="${_PTH_CPPFLAGS}"
>-
> post-extract:
> # The distribution tarball for python 2.7 has permission bits for 'others'
> # set to 0. Later during install, we copy Tools and Demo to the installed

Actions: View | Diff

Attachments on bug 191888: 144704