Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 Apr 2016 11:07:21 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r414099 - in branches/2016Q2/lang: python27 python27/files python33 python33/files python34 python34/files python35 python35/files
Message-ID:  <201604271107.u3RB7LG3003124@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim (src committer)
Date: Wed Apr 27 11:07:21 2016
New Revision: 414099
URL: https://svnweb.freebsd.org/changeset/ports/414099

Log:
  MFH: r414029
  
  For the various lang/python* ports, improve the __FreeBSD_version
  check in pyport.h for working around a very old ctype issue.
  
  If the workaround for this issue is enabled, pyport.h redefines
  toupper() and some other ctype macros, and this wreaks havoc when
  including newer libc++ headers (or any other system header which tries
  to declare those functions).
  
  Approved by:	portmgr (junovitch)
  PR:		208486

Added:
  branches/2016Q2/lang/python27/files/patch-Include__pyport.h
     - copied unchanged from r414029, head/lang/python27/files/patch-Include__pyport.h
  branches/2016Q2/lang/python33/files/patch-Include__pyport.h
     - copied unchanged from r414029, head/lang/python33/files/patch-Include__pyport.h
  branches/2016Q2/lang/python34/files/patch-Include__pyport.h
     - copied unchanged from r414029, head/lang/python34/files/patch-Include__pyport.h
  branches/2016Q2/lang/python35/files/patch-Include__pyport.h
     - copied unchanged from r414029, head/lang/python35/files/patch-Include__pyport.h
Modified:
  branches/2016Q2/lang/python27/Makefile
  branches/2016Q2/lang/python33/Makefile
  branches/2016Q2/lang/python34/Makefile
  branches/2016Q2/lang/python35/Makefile
Directory Properties:
  branches/2016Q2/   (props changed)

Modified: branches/2016Q2/lang/python27/Makefile
==============================================================================
--- branches/2016Q2/lang/python27/Makefile	Wed Apr 27 11:06:00 2016	(r414098)
+++ branches/2016Q2/lang/python27/Makefile	Wed Apr 27 11:07:21 2016	(r414099)
@@ -2,7 +2,7 @@
 
 PORTNAME=	python27
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}

Copied: branches/2016Q2/lang/python27/files/patch-Include__pyport.h (from r414029, head/lang/python27/files/patch-Include__pyport.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q2/lang/python27/files/patch-Include__pyport.h	Wed Apr 27 11:07:21 2016	(r414099, copy of r414029, head/lang/python27/files/patch-Include__pyport.h)
@@ -0,0 +1,13 @@
+--- Include/pyport.h.orig	2015-12-05 20:46:54.000000000 +0100
++++ Include/pyport.h	2016-04-03 17:14:53.047412000 +0200
+@@ -702,7 +702,9 @@
+ 
+ #ifdef __FreeBSD__
+ #include <osreldate.h>
+-#if __FreeBSD_version > 500039
++#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \
++    (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \
++    (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
+ # define _PY_PORT_CTYPE_UTF8_ISSUE
+ #endif
+ #endif

Modified: branches/2016Q2/lang/python33/Makefile
==============================================================================
--- branches/2016Q2/lang/python33/Makefile	Wed Apr 27 11:06:00 2016	(r414098)
+++ branches/2016Q2/lang/python33/Makefile	Wed Apr 27 11:07:21 2016	(r414099)
@@ -2,7 +2,7 @@
 
 PORTNAME=	python33
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}

Copied: branches/2016Q2/lang/python33/files/patch-Include__pyport.h (from r414029, head/lang/python33/files/patch-Include__pyport.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q2/lang/python33/files/patch-Include__pyport.h	Wed Apr 27 11:07:21 2016	(r414099, copy of r414029, head/lang/python33/files/patch-Include__pyport.h)
@@ -0,0 +1,13 @@
+--- Include/pyport.h.orig	2014-10-12 09:03:52.000000000 +0200
++++ Include/pyport.h	2016-04-03 19:26:20.938539000 +0200
+@@ -686,7 +686,9 @@
+ 
+ #ifdef __FreeBSD__
+ #include <osreldate.h>
+-#if __FreeBSD_version > 500039
++#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \
++    (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \
++    (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
+ # define _PY_PORT_CTYPE_UTF8_ISSUE
+ #endif
+ #endif

Modified: branches/2016Q2/lang/python34/Makefile
==============================================================================
--- branches/2016Q2/lang/python34/Makefile	Wed Apr 27 11:06:00 2016	(r414098)
+++ branches/2016Q2/lang/python34/Makefile	Wed Apr 27 11:07:21 2016	(r414099)
@@ -3,7 +3,7 @@
 
 PORTNAME=	python34
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}

Copied: branches/2016Q2/lang/python34/files/patch-Include__pyport.h (from r414029, head/lang/python34/files/patch-Include__pyport.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q2/lang/python34/files/patch-Include__pyport.h	Wed Apr 27 11:07:21 2016	(r414099, copy of r414029, head/lang/python34/files/patch-Include__pyport.h)
@@ -0,0 +1,13 @@
+--- Include/pyport.h.orig	2015-12-21 07:00:57.000000000 +0100
++++ Include/pyport.h	2016-04-03 19:29:17.797369000 +0200
+@@ -680,7 +680,9 @@
+ 
+ #ifdef __FreeBSD__
+ #include <osreldate.h>
+-#if __FreeBSD_version > 500039
++#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \
++    (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \
++    (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
+ # define _PY_PORT_CTYPE_UTF8_ISSUE
+ #endif
+ #endif

Modified: branches/2016Q2/lang/python35/Makefile
==============================================================================
--- branches/2016Q2/lang/python35/Makefile	Wed Apr 27 11:06:00 2016	(r414098)
+++ branches/2016Q2/lang/python35/Makefile	Wed Apr 27 11:07:21 2016	(r414099)
@@ -3,7 +3,7 @@
 
 PORTNAME=	python
 DISTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PYTHON_PORTVERSION}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}

Copied: branches/2016Q2/lang/python35/files/patch-Include__pyport.h (from r414029, head/lang/python35/files/patch-Include__pyport.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q2/lang/python35/files/patch-Include__pyport.h	Wed Apr 27 11:07:21 2016	(r414099, copy of r414029, head/lang/python35/files/patch-Include__pyport.h)
@@ -0,0 +1,13 @@
+--- Include/pyport.h.orig	2015-12-07 02:39:07.000000000 +0100
++++ Include/pyport.h	2016-04-03 19:31:36.801717000 +0200
+@@ -677,7 +677,9 @@
+ 
+ #ifdef __FreeBSD__
+ #include <osreldate.h>
+-#if __FreeBSD_version > 500039
++#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \
++    (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \
++    (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
+ # define _PY_PORT_CTYPE_UTF8_ISSUE
+ #endif
+ #endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604271107.u3RB7LG3003124>