ports/168767: [PATCH]: lang/python26+ must not set OPT

[Marcus von Appen]

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

From: Marcus von Appen <mva at FreeBSD.org>
To: freebsd-python at freebsd.org, bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/168767: [PATCH]: lang/python26+ must not set OPT
Date: Tue, 19 Jun 2012 22:50:48 +0200

 --DIOMP1UsTsWJauNi
 Content-Type: multipart/mixed; boundary="LpQ9ahxlCli8rRTG"
 Content-Disposition: inline
 
 
 --LpQ9ahxlCli8rRTG
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Attached is the correct patch for lang/python26 and lang/python27, which
 are the only python ports, which suffer from a wrong OPT assignment.
 
 The patch also fixes:
 
 ports/140968
 ports/153952
 ports/146644
 ports/141534
 ports/156425 (with the exception that py-libxml2 itself is broken, since
 it does notuse the correct mechanisms for Python includes)
 
 Regards
 Marcus
 
 --LpQ9ahxlCli8rRTG
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="python2x_PTH_OPT_fix.patch"
 Content-Transfer-Encoding: quoted-printable
 
 Index: python26/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/pcvs/ports/lang/python26/Makefile,v
 retrieving revision 1.186
 diff -u -r1.186 Makefile
 --- python26/Makefile	19 Jun 2012 17:48:41 -0000	1.186
 +++ python26/Makefile	19 Jun 2012 20:42:14 -0000
 @@ -21,7 +21,7 @@
  PATCH_WRKSRC=3D	${PYTHON_WRKSRC}
  GNU_CONFIGURE=3D	yes
  CONFIGURE_SCRIPT=3D	../configure # must be relative
 -CONFIGURE_ENV=3D	OPT=3D"${CFLAGS}" SVNVERSION=3D"echo freebsd"
 +CONFIGURE_ENV=3D	SVNVERSION=3D"echo freebsd"
  MAKE_ENV=3D	VPATH=3D"${PYTHON_WRKSRC}"
  USE_LDCONFIG=3D	yes
  MAKE_JOBS_SAFE=3D	yes
 @@ -147,6 +147,8 @@
  CONFIGURE_ARGS+=3D	--with-fpectl
  .endif
 =20
 +CONFIGURE_ENV+=3D	OPT=3D"${CFLAGS} ${_PTH_CPPFLAGS}"
 +
  pre-patch:
  	${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \
  		${PATCH_WRKSRC}/Lib/plat-freebsd9
 @@ -175,8 +177,10 @@
  		${PATCH_WRKSRC}/Makefile.pre.in
 =20
  	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION}|' \
 +		-e 's|libs =3D getvar|libs =3D getvar("LDFLAGS").split() + getvar|' \
  		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION}-conf=
 ig
  	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|=
 ' \
 +		-e 's|libs =3D getvar|libs =3D getvar("LDFLAGS").split() + getvar|' \
  		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/tho=
 n/thon-shared/}-config
 =20
  .if ${PORT_OPTIONS:MFPECTL) && ${ARCH} =3D=3D i386
 Index: python27/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/pcvs/ports/lang/python27/Makefile,v
 retrieving revision 1.191
 diff -u -r1.191 Makefile
 --- python27/Makefile	19 Jun 2012 17:48:41 -0000	1.191
 +++ python27/Makefile	19 Jun 2012 20:42:14 -0000
 @@ -21,7 +21,7 @@
  PATCH_WRKSRC=3D	${PYTHON_WRKSRC}
  GNU_CONFIGURE=3D	yes
  CONFIGURE_SCRIPT=3D	../configure # must be relative
 -CONFIGURE_ENV=3D	OPT=3D"${CFLAGS}" SVNVERSION=3D"echo freebsd"
 +CONFIGURE_ENV=3D	SVNVERSION=3D"echo freebsd"
  MAKE_ENV=3D	VPATH=3D"${PYTHON_WRKSRC}"
  USE_LDCONFIG=3D	yes
  MAKE_JOBS_SAFE=3D	yes
 @@ -156,6 +156,9 @@
  CONFIGURE_ARGS+=3D	--with-fpectl
  .endif
 =20
 +
 +CONFIGURE_ENV+=3D	OPT=3D"${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
 @@ -190,8 +193,10 @@
  		${PATCH_WRKSRC}/Makefile.pre.in
 =20
  	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION}|' \
 +		-e 's|libs =3D getvar|libs =3D getvar("LDFLAGS").split() + getvar|' \
  		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION}-conf=
 ig
  	${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|=
 ' \
 +		-e 's|libs =3D getvar|libs =3D getvar("LDFLAGS").split() + getvar|' \
  		${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/tho=
 n/thon-shared/}-config
 =20
  .if ${PORT_OPTIONS:MFPECTL) && ${ARCH} =3D=3D i386
 
 --LpQ9ahxlCli8rRTG--
 
 --DIOMP1UsTsWJauNi
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (FreeBSD)
 
 iEYEARECAAYFAk/g5igACgkQi68/ErJnpkffUgCgp1OgpWQ1O0ZGMAGUgw6C6q1Z
 GwsAoMBcn1BYk1INU3zjHwbBbG9TaLI8
 =Ve2c
 -----END PGP SIGNATURE-----
 
 --DIOMP1UsTsWJauNi--