diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-04-25 20:22:19 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-04-25 20:22:19 +0000 |
| commit | 3ab35818fcec73172595ca5b727ca3dd7bd3c032 (patch) | |
| tree | 7e7c326704e82b486d5e8f428a82ca99c405a319 /lang/python33 | |
| parent | - Update to 0.11.9 (diff) | |
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 (antoine)
PR: 208486
MFH: 2016Q2
Diffstat (limited to 'lang/python33')
| -rw-r--r-- | lang/python33/Makefile | 2 | ||||
| -rw-r--r-- | lang/python33/files/patch-Include__pyport.h | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lang/python33/Makefile b/lang/python33/Makefile index 9f4a90a47710..a99b6bcaee9e 100644 --- a/lang/python33/Makefile +++ b/lang/python33/Makefile @@ -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} diff --git a/lang/python33/files/patch-Include__pyport.h b/lang/python33/files/patch-Include__pyport.h new file mode 100644 index 000000000000..3b2389ae12ae --- /dev/null +++ b/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 |