diff options
| author | mva <mva@FreeBSD.org> | 2012-07-22 17:45:24 +0800 |
|---|---|---|
| committer | mva <mva@FreeBSD.org> | 2012-07-22 17:45:24 +0800 |
| commit | 59def72b619f5336d54cdaeef04a2fd980f1110a (patch) | |
| tree | 265af112e1fadc3a264bb2971fb018cbcd6b5030 | |
| parent | 9d83eb74fffd49b8e1c066f6704a0793a99c2999 (diff) | |
| download | freebsd-ports-gnome-59def72b619f5336d54cdaeef04a2fd980f1110a.tar.gz freebsd-ports-gnome-59def72b619f5336d54cdaeef04a2fd980f1110a.tar.zst freebsd-ports-gnome-59def72b619f5336d54cdaeef04a2fd980f1110a.zip | |
- Fix Python OPT flags for WITH_PTH knob
PR: ports/168767
Submitted by: Marcus von Appen <mva@freebsd.org>
| -rw-r--r-- | lang/python26/Makefile | 8 | ||||
| -rw-r--r-- | lang/python27/Makefile | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile index cfd285d858dd..bca1c38f7c11 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -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 diff --git a/lang/python27/Makefile b/lang/python27/Makefile index dbff4c2e1243..6e865062b4ab 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -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 |