cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix Python OPT flags for WITH_PTH knob

Browse Source 
PR:		ports/168767
Submitted by:	Marcus von Appen <mva@freebsd.org>
This commit is contained in:
Marcus von Appen 2012-07-22 09:45:24 +00:00
parent 3e613ab153
commit a9682d1571
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=301311
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/python26/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= python26
PORTVERSION= 2.6.8
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@ -21,7 +21,7 @@ WRKSRC= ${PYTHON_WRKSRC}/portbld.static
PATCH_WRKSRC= ${PYTHON_WRKSRC}
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= ../configure # must be relative
CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd"
CONFIGURE_ENV= SVNVERSION="echo freebsd"
MAKE_ENV= VPATH="${PYTHON_WRKSRC}"
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
@ -148,6 +148,8 @@ CONFIGURE_ARGS+= --disable-ipv6
CONFIGURE_ARGS+= --with-fpectl
.endif
CONFIGURE_ENV+= OPT="${CFLAGS} ${_PTH_CPPFLAGS}"
pre-patch:
${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
${PATCH_WRKSRC}/Lib/plat-freebsd9
@ -176,8 +178,10 @@ pre-patch:
${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

9
lang/python27/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= python27
PORTVERSION= 2.7.3
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@ -21,7 +21,7 @@ WRKSRC= ${PYTHON_WRKSRC}/portbld.static
PATCH_WRKSRC= ${PYTHON_WRKSRC}
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= ../configure # must be relative
CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd"
CONFIGURE_ENV= SVNVERSION="echo freebsd"
MAKE_ENV= VPATH="${PYTHON_WRKSRC}"
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
@ -157,6 +157,9 @@ CONFIGURE_ARGS+= --disable-ipv6
CONFIGURE_ARGS+= --with-fpectl
.endif
CONFIGURE_ENV+= OPT="${CFLAGS} ${_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
@ -191,8 +194,10 @@ pre-patch:
${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