diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-22 16:14:26 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-22 16:29:19 +0300 |
| commit | 1727fc2794a7ee78117e1c5b9bc4df2d1367965c (patch) | |
| tree | 0af4c9c732a8aeb52edcebf6153a8715be6bd378 /python3 | |
| parent | c86a23b9c739519b2c7c45b3ee67399549adacdc (diff) | |
Fix python3 build on a clean OS X with no /usr/include
Change-Id: I5982c44d5995baeaffff4ff12316f1f8fa7d0ade
Diffstat (limited to 'python3')
| -rw-r--r-- | python3/UnpackedTarball_python3.mk | 1 | ||||
| -rw-r--r-- | python3/python-3.3.0-clang.patch.1 | 13 | ||||
| -rw-r--r-- | python3/python-3.3.0-darwin.patch.1 | 26 |
3 files changed, 40 insertions, 0 deletions
diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk index 08d3283b39f6..fb30a40048cb 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/python3/UnpackedTarball_python3.mk @@ -32,6 +32,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ python3/python-3.3.0-ffi-clang.patch.1 \ python3/python-3.3.0-gcc-4.8.patch.1 \ python3/python-3.3.0-pythreadstate.patch.1 \ + python3/python-3.3.0-clang.patch.1 \ )) ifneq ($(OS),WNT) diff --git a/python3/python-3.3.0-clang.patch.1 b/python3/python-3.3.0-clang.patch.1 new file mode 100644 index 000000000000..9001110fbed4 --- /dev/null +++ b/python3/python-3.3.0-clang.patch.1 @@ -0,0 +1,13 @@ +-*- Mode: diff -*- + +--- python3/setup.py ++++ python3/setup.py +@@ -436,7 +436,7 @@ + if ret >> 8 == 0: + with open(tmpfile) as fp: + for line in fp.readlines(): +- if line.startswith("gcc version"): ++ if line.startswith("gcc version") or line.startswith("clang -cc1 version"): + is_gcc = True + elif line.startswith("#include <...>"): + in_incdirs = True diff --git a/python3/python-3.3.0-darwin.patch.1 b/python3/python-3.3.0-darwin.patch.1 index 94e48fe3f25c..a32b7f588b01 100644 --- a/python3/python-3.3.0-darwin.patch.1 +++ b/python3/python-3.3.0-darwin.patch.1 @@ -1,3 +1,5 @@ +-*- Mode: diff -*- + LO needs to build both against MacOSX SDK and not produce universal binaries. diff -ru python3.old_/configure python3/configure @@ -24,6 +26,30 @@ diff -ru python3.old_/configure python3/configure ARCH_RUN_32BIT="" LIPO_32BIT_FLAGS="" elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then + +On OS X avoid /usr/local/lib and include like the plague, we don't +want to accidentally get some MacPorts etc stuff. + +On OS X, always run the compiler (which is Clang, not gcc) to find out +what the include paths are. On a clean modern installation, there is +no /usr/include. + +--- python3/setup.py ++++ python3/setup.py +@@ -460,11 +460,11 @@ + # Ensure that /usr/local is always used, but the local build + # directories (i.e. '.' and 'Include') must be first. See issue + # 10520. +- if not cross_compiling: ++ if not cross_compiling and host_platform != 'darwin': + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + # only change this for cross builds for 3.3, issues on Mageia +- if cross_compiling: ++ if cross_compiling or host_platform == 'darwin': + self.add_gcc_paths() + self.add_multiarch_paths() + --- python3/Mac/Makefile.in.orig 2013-09-13 20:16:50.558137603 +0200 +++ python3/Mac/Makefile.in 2013-09-13 21:57:14.790962423 +0200 @@ -39,7 +39,7 @@ |