aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authorkoobs <koobs@FreeBSD.org>2014-04-20 09:35:39 +0800
committerkoobs <koobs@FreeBSD.org>2014-04-20 09:35:39 +0800
commitbba6ff65c848eb68d1b69a453bf19473146dd0d7 (patch)
tree10eddd80ada2a63dcbb01b596cd8b78ff92f995d /lang
parenta6edf51e8cd04e07a8d0edc89b558f1236235823 (diff)
downloadfreebsd-ports-gnome-bba6ff65c848eb68d1b69a453bf19473146dd0d7.tar.gz
freebsd-ports-gnome-bba6ff65c848eb68d1b69a453bf19473146dd0d7.tar.zst
freebsd-ports-gnome-bba6ff65c848eb68d1b69a453bf19473146dd0d7.zip
lang/python{31,32,33}: Add clang 3.4 fix from python27
Copy change committed to python27 [1] to python31, python32 and python33 to fix builds of some extensions with Clang 3.4. Also add breadcrumbs to the patch header in lang/python27 referencing the upstream issue. [2] The Python 3.4 port (lang/python34) already carries the patch. [1] https://svnweb.freebsd.org/ports?view=revision&revision=346428 [2] http://bugs.python.org/issue20767
Diffstat (limited to 'lang')
-rw-r--r--lang/python27/files/patch-Lib__distutils__unixccompiler.py4
-rw-r--r--lang/python31/Makefile2
-rw-r--r--lang/python31/files/patch-Lib__distutils__unixccompiler.py15
-rw-r--r--lang/python32/Makefile2
-rw-r--r--lang/python32/files/patch-Lib__distutils__unixccompiler.py15
-rw-r--r--lang/python33/Makefile1
-rw-r--r--lang/python33/files/patch-Lib__distutils__unixccompiler.py15
7 files changed, 52 insertions, 2 deletions
diff --git a/lang/python27/files/patch-Lib__distutils__unixccompiler.py b/lang/python27/files/patch-Lib__distutils__unixccompiler.py
index a7e71a0be3cb..f80797e98e4c 100644
--- a/lang/python27/files/patch-Lib__distutils__unixccompiler.py
+++ b/lang/python27/files/patch-Lib__distutils__unixccompiler.py
@@ -1,3 +1,7 @@
+# Description: Some python extensions can't be compiled with clang 3.4
+# Issue ID: http://bugs.python.org/issue20767
+# Submitted by: antoine
+
--- ./Lib/distutils/unixccompiler.py.orig 2013-11-10 07:36:40.000000000 +0000
+++ ./Lib/distutils/unixccompiler.py 2014-02-19 15:41:48.000000000 +0000
@@ -228,6 +228,8 @@
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index d997d114025f..88d78b8454df 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -2,7 +2,7 @@
PORTNAME= python31
PORTVERSION= 3.1.5
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/lang/python31/files/patch-Lib__distutils__unixccompiler.py b/lang/python31/files/patch-Lib__distutils__unixccompiler.py
new file mode 100644
index 000000000000..930c565520bb
--- /dev/null
+++ b/lang/python31/files/patch-Lib__distutils__unixccompiler.py
@@ -0,0 +1,15 @@
+# Description: Some python extensions can't be compiled with clang 3.4
+# Issue ID: http://bugs.python.org/issue20767
+# Submitted by: antoine
+
+--- ./Lib/distutils/unixccompiler.py.orig 2014-03-09 14:58:11.840899942 +1100
++++ ./Lib/distutils/unixccompiler.py 2014-03-09 15:07:24.038743110 +1100
+@@ -285,6 +285,8 @@
+ if sys.platform[:6] == "darwin":
+ # MacOSX's linker doesn't understand the -R flag at all
+ return "-L" + dir
++ elif sys.platform[:7] == "freebsd":
++ return "-Wl,-rpath=" + dir
+ elif sys.platform[:5] == "hp-ux":
+ if self._is_gcc(compiler):
+ return ["-Wl,+s", "-L" + dir]
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 0b7cc6066659..afd6063266df 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -2,7 +2,7 @@
PORTNAME= python32
PORTVERSION= 3.2.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/lang/python32/files/patch-Lib__distutils__unixccompiler.py b/lang/python32/files/patch-Lib__distutils__unixccompiler.py
new file mode 100644
index 000000000000..3480dc2b4ca2
--- /dev/null
+++ b/lang/python32/files/patch-Lib__distutils__unixccompiler.py
@@ -0,0 +1,15 @@
+# Description: Some python extensions can't be compiled with clang 3.4
+# Issue ID: http://bugs.python.org/issue20767
+# Submitted by: antoine
+
+--- ./Lib/distutils/unixccompiler.py.orig 2014-03-09 15:23:38.647562705 +1100
++++ ./Lib/distutils/unixccompiler.py 2014-03-09 15:23:56.020904510 +1100
+@@ -225,6 +225,8 @@
+ if sys.platform[:6] == "darwin":
+ # MacOSX's linker doesn't understand the -R flag at all
+ return "-L" + dir
++ elif sys.platform[:7] == "freebsd":
++ return "-Wl,-rpath=" + dir
+ elif sys.platform[:5] == "hp-ux":
+ if self._is_gcc(compiler):
+ return ["-Wl,+s", "-L" + dir]
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index e44f01faccee..edb7c137a6a1 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -2,6 +2,7 @@
PORTNAME= python33
PORTVERSION= 3.3.5
+PORTREVISION= 1
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/lang/python33/files/patch-Lib__distutils__unixccompiler.py b/lang/python33/files/patch-Lib__distutils__unixccompiler.py
new file mode 100644
index 000000000000..3012c52a85cd
--- /dev/null
+++ b/lang/python33/files/patch-Lib__distutils__unixccompiler.py
@@ -0,0 +1,15 @@
+# Description: Some python extensions can't be compiled with clang 3.4
+# Issue ID: http://bugs.python.org/issue20767
+# Submitted by: antoine
+
+--- ./Lib/distutils/unixccompiler.py.orig 2014-03-09 15:25:15.921204441 +1100
++++ ./Lib/distutils/unixccompiler.py 2014-03-09 15:25:50.643809649 +1100
+@@ -225,6 +225,8 @@
+ if sys.platform[:6] == "darwin":
+ # MacOSX's linker doesn't understand the -R flag at all
+ return "-L" + dir
++ elif sys.platform[:7] == "freebsd":
++ return "-Wl,-rpath=" + dir
+ elif sys.platform[:5] == "hp-ux":
+ if self._is_gcc(compiler):
+ return ["-Wl,+s", "-L" + dir]