Attachment 144604 Details for Bug 169276 – Experimental patch to remove our local hacks

[patch] Experimental patch to remove our local hacks

python27.diff (text/plain), 4.74 KB, created by Jung-uk Kim on 2014-07-11 22:30:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2014-07-11 22:30:16 UTC

Size: 4.74 KB

patch

obsolete

>Index: lang/python27/Makefile
>===================================================================
>--- lang/python27/Makefile	(revision 361588)
>+++ lang/python27/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	python27
> PORTVERSION=	2.7.6
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	lang python ipv6
> MASTER_SITES=	PYTHON
> MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
>@@ -57,7 +57,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=		THREADS SEM PTH PYMALLOC IPV6 FPECTL EXAMPLES NLS
>+OPTIONS_DEFINE=		THREADS SEM PYMALLOC IPV6 FPECTL EXAMPLES NLS
> OPTIONS_DEFAULT=	THREADS UCS4 PYMALLOC IPV6
> 
> OPTIONS_SINGLE=		UCS
>@@ -70,7 +70,8 @@ NLS_DESC=	Enable Gettext support for the locale mo
> .if ${PORT_OPTIONS:MNLS}
> USES+=		gettext
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib -lintl
>+LIBS+=		-lintl
>+PYTHON_LDFLAGS+=	-L${LOCALBASE}/lib
> .else
> CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
> .endif
>@@ -88,19 +89,12 @@ SUB_LIST=	SEM=${SEM_MSG}
> 
> .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}
>+.if !empty(PTHREAD_LIBS) && ${PTHREAD_LIBS:M-l*}
>+LIBS+=			${PTHREAD_LIBS}
>+.else
>+PYTHON_LDFLAGS+=	${PTHREAD_LIBS}
> .endif
> .else
> PLIST_SUB+=	THREADS="@comment "
>@@ -154,7 +148,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
> CONFIGURE_ARGS+=	--with-fpectl
> .endif
> 
>-CONFIGURE_ENV+=	OPT="${_PTH_CPPFLAGS}"
>+LDFLAGS+=	${PYTHON_LDFLAGS}
> 
> post-extract:
> # The distribution tarball for python 2.7 has permission bits for 'others'
>@@ -184,20 +178,10 @@ pre-patch:
> 		${PATCH_WRKSRC}/Lib/site.py
> 	${REINPLACE_CMD} -e \
> 		's|^	$..ASDLGEN.*$$$|	${TRUE}|g; \
>-		s|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
>+		s|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g; \
>+		s|*$..INSTALL_SCRIPT.*$python-config$$|#port \1|' \
> 		${PATCH_WRKSRC}/Makefile.pre.in
> 
>-	${REINPLACE_CMD} -e \
>-		's|*$..INSTALL_SCRIPT.*$python-config$$|#port \1|' \
>-		${PATCH_WRKSRC}/Makefile.pre.in
>-
>-	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION}|' \
>-		-e 's|libs = getvar|libs = getvar("LDFLAGS").split() + getvar|' \
>-		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION}-config
>-	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \
>-		-e 's|libs = getvar|libs = getvar("LDFLAGS").split() + getvar|' \
>-		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config
>-
> .if ${PORT_OPTIONS:MFPECTL} && ${ARCH} == i386
> 	${MKDIR} ${WRKSRC}/Modules
> 	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
>@@ -204,6 +188,12 @@ pre-patch:
> .endif
> 
> post-patch:
>+	${SED} -e 's|^#!@EXENAME@|#!${PREFIX}/bin/${PYTHON_VERSION}|' \
>+		-e 's|%%LDFLAGS%%|${PYTHON_LDFLAGS}|' \
>+		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION}-config
>+	${SED} -e 's|^#!@EXENAME@|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \
>+		-e 's|%%LDFLAGS%%|${PYTHON_LDFLAGS}|' \
>+		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config
> .if ${PORT_OPTIONS:MSEM}
> 	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-setup.py
> .endif
>Index: lang/python27/files/patch-Misc__python-config.in
>===================================================================
>--- lang/python27/files/patch-Misc__python-config.in	(revision 0)
>+++ lang/python27/files/patch-Misc__python-config.in	(working copy)
>@@ -0,0 +1,10 @@
>+--- Misc/python-config.in	2013-11-10 02:36:41.000000000 -0500
>++++ Misc/python-config.in	2014-07-11 16:51:19.000000000 -0400
>+@@ -49,6 +49,7 @@
>+         # add the prefix/lib/pythonX.Y/config dir, but only if there is no
>+         # shared library in prefix/lib/.
>+         if opt == '--ldflags':
>++            libs.insert(0, '%%LDFLAGS%%')
>+             if not getvar('Py_ENABLE_SHARED'):
>+                 libs.insert(0, '-L' + getvar('LIBPL'))
>+             if not getvar('PYTHONFRAMEWORK'):
>
>Property changes on: lang/python27/files/patch-Misc__python-config.in
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 169276: 144366 | 144604