Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
1727fc27
Kaydet (Commit)
1727fc27
authored
Eyl 22, 2013
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fix python3 build on a clean OS X with no /usr/include
Change-Id: I5982c44d5995baeaffff4ff12316f1f8fa7d0ade
üst
c86a23b9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
0 deletions
+40
-0
UnpackedTarball_python3.mk
python3/UnpackedTarball_python3.mk
+1
-0
python-3.3.0-clang.patch.1
python3/python-3.3.0-clang.patch.1
+13
-0
python-3.3.0-darwin.patch.1
python3/python-3.3.0-darwin.patch.1
+26
-0
No files found.
python3/UnpackedTarball_python3.mk
Dosyayı görüntüle @
1727fc27
...
...
@@ -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)
...
...
python3/python-3.3.0-clang.patch.1
0 → 100644
Dosyayı görüntüle @
1727fc27
-*- 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
python3/python-3.3.0-darwin.patch.1
Dosyayı görüntüle @
1727fc27
-*- 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 @@
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment