svn commit: r447898 - in branches/2017Q3/lang: python27 python33 python34 python35

Sunpoet Po-Chuan Hsieh sunpoet at FreeBSD.org
Sun Aug 13 16:35:05 UTC 2017


Author: sunpoet
Date: Sun Aug 13 16:35:04 2017
New Revision: 447898
URL: https://svnweb.freebsd.org/changeset/ports/447898

Log:
  MFH: r447129 r447530
  
  Add a code block for the qemu-user enabled cross build environment.  When using
  this environment in poudriere, CC is not set to the default of /usr/bin/cc and
  a cross-compile toolchain is used.  We need to hand edit this so that the run
  time configuration for python matches what the FreeBSD base system provides.
  
  PR:		208282
  Submitted by:	manu
  Approved by:	portmgr (mat)
  
  Pointyhat to me.
  
  A stray '.' somehow made it past my testing.
  
  Do *not* bump portrevision as this only affects the packaging/stage
  of these ports on mips/armv6 or other cross compiled targets.
  
  PR:		221202
  Reported by:	antoine
  
  Approved by:	ports-secteam (zi)

Modified:
  branches/2017Q3/lang/python27/Makefile
  branches/2017Q3/lang/python33/Makefile
  branches/2017Q3/lang/python34/Makefile
  branches/2017Q3/lang/python35/Makefile
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/lang/python27/Makefile
==============================================================================
--- branches/2017Q3/lang/python27/Makefile	Sun Aug 13 16:30:58 2017	(r447897)
+++ branches/2017Q3/lang/python27/Makefile	Sun Aug 13 16:35:04 2017	(r447898)
@@ -2,7 +2,7 @@
 
 PORTNAME=	python27
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
@@ -136,6 +136,17 @@ post-patch:
 post-install:
 	for i in ${STAGEDIR}${PREFIX}/lib/python2.7/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done						# Strip shared extensions
+# This code block exists for the qemu-user enabled cross build environment.
+# When using this environment in poudriere, CC is not set to the default
+# of /usr/bin/cc and a cross-compile toolchain is used.  We need to hand
+# edit this so that the run time configuration for python matches what the
+# FreeBSD base system provides.  sbruno 02Aug2017
+.if ${CC} == /nxb-bin/usr/bin/cc
+	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
+		${STAGEDIR}${PREFIX}/lib/python2.7/_sysconfigdata.py
+	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
+		${STAGEDIR}${PREFIX}/lib/python2.7/config/Makefile
+.endif
 	${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \
 		${STAGEDIR}${PREFIX}/lib/libpython2.7.so.1-gdb.py
 

Modified: branches/2017Q3/lang/python33/Makefile
==============================================================================
--- branches/2017Q3/lang/python33/Makefile	Sun Aug 13 16:30:58 2017	(r447897)
+++ branches/2017Q3/lang/python33/Makefile	Sun Aug 13 16:35:04 2017	(r447898)
@@ -2,7 +2,7 @@
 
 PORTNAME=	python33
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
@@ -128,6 +128,17 @@ post-install:
 .endif
 	for i in ${STAGEDIR}${PREFIX}/lib/python3.3/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done								# Strip shared extensions
+# This code block exists for the qemu-user enabled cross build environment.
+# When using this environment in poudriere, CC is not set to the default
+# of /usr/bin/cc and a cross-compile toolchain is used.  We need to hand
+# edit this so that the run time configuration for python matches what the
+# FreeBSD base system provides.  sbruno 02Aug2017
+.if ${CC} == /nxb-bin/usr/bin/cc
+	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
+		${STAGEDIR}${PREFIX}/lib/python3.3/_sysconfigdata.py
+	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
+		${STAGEDIR}${PREFIX}/lib/python3.3/config-3.3m/Makefile
+.endif
 	${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \
 		${STAGEDIR}${PREFIX}/lib/libpython3.3${ABIFLAGS}.so.1-gdb.py
 

Modified: branches/2017Q3/lang/python34/Makefile
==============================================================================
--- branches/2017Q3/lang/python34/Makefile	Sun Aug 13 16:30:58 2017	(r447897)
+++ branches/2017Q3/lang/python34/Makefile	Sun Aug 13 16:35:04 2017	(r447898)
@@ -3,7 +3,7 @@
 
 PORTNAME=	python34
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
@@ -133,6 +133,17 @@ post-install:
 .endif
 	for i in ${STAGEDIR}${PREFIX}/lib/python3.4/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done								# Strip shared extensions
+# This code block exists for the qemu-user enabled cross build environment.
+# When using this environment in poudriere, CC is not set to the default
+# of /usr/bin/cc and a cross-compile toolchain is used.  We need to hand
+# edit this so that the run time configuration for python matches what the
+# FreeBSD base system provides.  sbruno 02Aug2017
+.if ${CC} == /nxb-bin/usr/bin/cc
+	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
+		${STAGEDIR}${PREFIX}/lib/python3.4/_sysconfigdata.py
+	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
+		${STAGEDIR}${PREFIX}/lib/python3.4/config-3.4m/Makefile
+.endif
 	${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \
 		${STAGEDIR}${PREFIX}/lib/libpython3.4${ABIFLAGS}.so.1-gdb.py
 

Modified: branches/2017Q3/lang/python35/Makefile
==============================================================================
--- branches/2017Q3/lang/python35/Makefile	Sun Aug 13 16:30:58 2017	(r447897)
+++ branches/2017Q3/lang/python35/Makefile	Sun Aug 13 16:35:04 2017	(r447898)
@@ -3,7 +3,7 @@
 
 PORTNAME=	python
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PYTHON_PORTVERSION}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
@@ -143,6 +143,17 @@ post-install:
 .endif
 	for i in ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done								# Strip shared extensions
+# This code block exists for the qemu-user enabled cross build environment.
+# When using this environment in poudriere, CC is not set to the default
+# of /usr/bin/cc and a cross-compile toolchain is used.  We need to hand
+# edit this so that the run time configuration for python matches what the
+# FreeBSD base system provides.  sbruno 02Aug2017
+.if ${CC} == /nxb-bin/usr/bin/cc
+	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
+		${STAGEDIR}${PREFIX}/lib/python3.5/_sysconfigdata.py
+	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
+		${STAGEDIR}${PREFIX}/lib/python3.5/config-3.5m/Makefile
+.endif
 	${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \
 		${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1.0-gdb.py
 


More information about the svn-ports-branches mailing list