ports/168767: commit references a PR

[dfilter service]

The following reply was made to PR ports/168767; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/168767: commit references a PR
Date: Sun, 22 Jul 2012 09:45:35 +0000 (UTC)

 Author: mva
 Date: Sun Jul 22 09:45:24 2012
 New Revision: 301311
 URL: http://svn.freebsd.org/changeset/ports/301311
 
 Log:
   - Fix Python OPT flags for WITH_PTH knob
   
   PR:		ports/168767
   Submitted by:	Marcus von Appen <mva at freebsd.org>
 
 Modified:
   head/lang/python26/Makefile   (contents, props changed)
   head/lang/python27/Makefile   (contents, props changed)
 
 Modified: head/lang/python26/Makefile
 ==============================================================================
 --- head/lang/python26/Makefile	Sun Jul 22 09:25:07 2012	(r301310)
 +++ head/lang/python26/Makefile	Sun Jul 22 09:45:24 2012	(r301311)
 @@ -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
 
 Modified: head/lang/python27/Makefile
 ==============================================================================
 --- head/lang/python27/Makefile	Sun Jul 22 09:25:07 2012	(r301310)
 +++ head/lang/python27/Makefile	Sun Jul 22 09:45:24 2012	(r301311)
 @@ -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
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"