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

(-)lang/python27/Makefile (-27 / +17 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	python27
4
PORTNAME=	python27
5
PORTVERSION=	2.7.6
5
PORTVERSION=	2.7.6
6
PORTREVISION=	4
6
PORTREVISION=	5
7
CATEGORIES=	lang python ipv6
7
CATEGORIES=	lang python ipv6
8
MASTER_SITES=	PYTHON
8
MASTER_SITES=	PYTHON
9
MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
9
MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
Lines 57-63 BINLINKS_SUB_TMPL= -e 's,smtpd,smtpd%%VERSION%%,' Link Here
57
			-e 's,(idle|pydoc|python-shared|python),\1%%VERSION%%,'
57
			-e 's,(idle|pydoc|python-shared|python),\1%%VERSION%%,'
58
BINLINKS_SUB_PYTHON_VER=	${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_VER}/g}
58
BINLINKS_SUB_PYTHON_VER=	${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_VER}/g}
59
59
60
OPTIONS_DEFINE=		THREADS SEM PTH PYMALLOC IPV6 FPECTL EXAMPLES NLS
60
OPTIONS_DEFINE=		THREADS SEM PYMALLOC IPV6 FPECTL EXAMPLES NLS
61
OPTIONS_DEFAULT=	THREADS UCS4 PYMALLOC IPV6
61
OPTIONS_DEFAULT=	THREADS UCS4 PYMALLOC IPV6
62
62
63
OPTIONS_SINGLE=		UCS
63
OPTIONS_SINGLE=		UCS
Lines 70-76 NLS_DESC= Enable Gettext support for the locale mo Link Here
70
.if ${PORT_OPTIONS:MNLS}
70
.if ${PORT_OPTIONS:MNLS}
71
USES+=		gettext
71
USES+=		gettext
72
CPPFLAGS+=	-I${LOCALBASE}/include
72
CPPFLAGS+=	-I${LOCALBASE}/include
73
LIBS+=		-L${LOCALBASE}/lib -lintl
73
LIBS+=		-lintl
74
PYTHON_LDFLAGS+=	-L${LOCALBASE}/lib
74
.else
75
.else
75
CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
76
CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
76
.endif
77
.endif
Lines 88-106 SUB_LIST= SEM=${SEM_MSG} Link Here
88
89
89
.if ${PORT_OPTIONS:MTHREADS}
90
.if ${PORT_OPTIONS:MTHREADS}
90
PLIST_SUB+=	THREADS=""
91
PLIST_SUB+=	THREADS=""
91
.if ${PORT_OPTIONS:MPTH}
92
CONFIGURE_ARGS+=	--with-pth --with-system-ffi
93
CONFIGURE_ENV+=		ac_cv_pthread=no
94
LIB_DEPENDS+=		libpth.so:${PORTSDIR}/devel/pth \
95
			libffi.so:${PORTSDIR}/devel/libffi
96
_PTH_CPPFLAGS=		"-I${LOCALBASE}/include/pth"
97
_PTH_LDFLAGS=		"-L${LOCALBASE}/lib/pth"
98
CPPFLAGS:=		${_PTH_CPPFLAGS} ${CPPFLAGS}
99
LDFLAGS+=		${_PTH_LDFLAGS}
100
.else
101
CONFIGURE_ARGS+=	--with-threads
92
CONFIGURE_ARGS+=	--with-threads
102
CFLAGS+=		${PTHREAD_CFLAGS}
93
CFLAGS+=		${PTHREAD_CFLAGS}
103
LDFLAGS+=		${PTHREAD_LIBS}
94
.if !empty(PTHREAD_LIBS) && ${PTHREAD_LIBS:M-l*}
95
LIBS+=			${PTHREAD_LIBS}
96
.else
97
PYTHON_LDFLAGS+=	${PTHREAD_LIBS}
104
.endif
98
.endif
105
.else
99
.else
106
PLIST_SUB+=	THREADS="@comment "
100
PLIST_SUB+=	THREADS="@comment "
Lines 154-160 CONFIGURE_ARGS+= --disable-ipv6 Link Here
154
CONFIGURE_ARGS+=	--with-fpectl
148
CONFIGURE_ARGS+=	--with-fpectl
155
.endif
149
.endif
156
150
157
CONFIGURE_ENV+=	OPT="${_PTH_CPPFLAGS}"
151
LDFLAGS+=	${PYTHON_LDFLAGS}
158
152
159
post-extract:
153
post-extract:
160
# The distribution tarball for python 2.7 has permission bits for 'others'
154
# The distribution tarball for python 2.7 has permission bits for 'others'
Lines 184-203 pre-patch: Link Here
184
		${PATCH_WRKSRC}/Lib/site.py
178
		${PATCH_WRKSRC}/Lib/site.py
185
	${REINPLACE_CMD} -e \
179
	${REINPLACE_CMD} -e \
186
		's|^	\(..ASDLGEN.*\)$$|	${TRUE}|g; \
180
		's|^	\(..ASDLGEN.*\)$$|	${TRUE}|g; \
187
		s|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
181
		s|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g; \
182
		s|*\(..INSTALL_SCRIPT.*\)python-config$$|#port \1|' \
188
		${PATCH_WRKSRC}/Makefile.pre.in
183
		${PATCH_WRKSRC}/Makefile.pre.in
189
184
190
	${REINPLACE_CMD} -e \
191
		's|*\(..INSTALL_SCRIPT.*\)python-config$$|#port \1|' \
192
		${PATCH_WRKSRC}/Makefile.pre.in
193
194
	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION}|' \
195
		-e 's|libs = getvar|libs = getvar("LDFLAGS").split() + getvar|' \
196
		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION}-config
197
	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \
198
		-e 's|libs = getvar|libs = getvar("LDFLAGS").split() + getvar|' \
199
		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config
200
201
.if ${PORT_OPTIONS:MFPECTL} && ${ARCH} == i386
185
.if ${PORT_OPTIONS:MFPECTL} && ${ARCH} == i386
202
	${MKDIR} ${WRKSRC}/Modules
186
	${MKDIR} ${WRKSRC}/Modules
203
	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
187
	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
Lines 204-209 pre-patch: Link Here
204
.endif
188
.endif
205
189
206
post-patch:
190
post-patch:
191
	${SED} -e 's|^#!@EXENAME@|#!${PREFIX}/bin/${PYTHON_VERSION}|' \
192
		-e 's|%%LDFLAGS%%|${PYTHON_LDFLAGS}|' \
193
		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION}-config
194
	${SED} -e 's|^#!@EXENAME@|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \
195
		-e 's|%%LDFLAGS%%|${PYTHON_LDFLAGS}|' \
196
		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config
207
.if ${PORT_OPTIONS:MSEM}
197
.if ${PORT_OPTIONS:MSEM}
208
	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-setup.py
198
	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-setup.py
209
.endif
199
.endif
(-)lang/python27/files/patch-Misc__python-config.in (+10 lines)
Line 0 Link Here
1
--- Misc/python-config.in	2013-11-10 02:36:41.000000000 -0500
2
+++ Misc/python-config.in	2014-07-11 16:51:19.000000000 -0400
3
@@ -49,6 +49,7 @@
4
         # add the prefix/lib/pythonX.Y/config dir, but only if there is no
5
         # shared library in prefix/lib/.
6
         if opt == '--ldflags':
7
+            libs.insert(0, '%%LDFLAGS%%')
8
             if not getvar('Py_ENABLE_SHARED'):
9
                 libs.insert(0, '-L' + getvar('LIBPL'))
10
             if not getvar('PYTHONFRAMEWORK'):

Return to bug 169276