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
69c6ba95
Kaydet (Commit)
69c6ba95
authored
Kas 28, 2012
tarafından
Jan Holesovsky
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Update the Python checks for cross-compiling.
Change-Id: I1066c9108fd31682bd238df50bdf1cab0a05d3ec
üst
332bd429
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
18 deletions
+20
-18
configure.ac
configure.ac
+20
-18
No files found.
configure.ac
Dosyayı görüntüle @
69c6ba95
...
...
@@ -7389,8 +7389,8 @@ if test $enable_python = system; then
# 2.6.2 currently on OpenSUSE 12.1?
# rpm -q mingw32-python => mingw32-python-2.6.2-17.17.noarch
PYTHON_VERSION=$python_version.2
PYTHON_MAJOR=${python_version%.*}
PYTHON_MINOR=${python_version#*.}
PYTHON_
VERSION_
MAJOR=${python_version%.*}
PYTHON_
VERSION_
MINOR=${python_version#*.}
break
fi
done
...
...
@@ -7403,18 +7403,19 @@ case $enable_python in
system)
SYSTEM_PYTHON=YES
dnl Check if the headers really work
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
AC_CHECK_HEADER(Python.h, [],
[AC_MSG_ERROR([Python headers not found. You probably want to set both the PYTHON_CFLAGS and PYTHON_LIBS environment variables.])],
[])
CPPFLAGS="$save_CPPFLAGS"
AC_LANG_PUSH(C)
CFLAGS="$CFLAGS $PYTHON_CFLAGS"
AC_MSG_CHECKING([for correct python library version])
AC_RUN_IFELSE([AC_LANG_SOURCE([[
if test "$CROSS_COMPILING" != YES; then
dnl Check if the headers really work
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
AC_CHECK_HEADER(Python.h, [],
[AC_MSG_ERROR([Python headers not found. You probably want to set both the PYTHON_CFLAGS and PYTHON_LIBS environment variables.])],
[])
CPPFLAGS="$save_CPPFLAGS"
AC_LANG_PUSH(C)
CFLAGS="$CFLAGS $PYTHON_CFLAGS"
AC_MSG_CHECKING([for correct python library version])
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <Python.h>
int main(int argc, char **argv) {
...
...
@@ -7422,11 +7423,12 @@ int main(int argc, char **argv) {
(PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 3)) return 0;
else return 1;
}
]])],[AC_MSG_RESULT([ok])],[AC_MSG_ERROR([Python >= 3.3 is needed when building with Python 3, or Python >= 2.6 when building with Python 2])],[])
CFLAGS=$save_CFLAGS
AC_LANG_POP(C)
]])],[AC_MSG_RESULT([ok])],[AC_MSG_ERROR([Python >= 3.3 is needed when building with Python 3, or Python >= 2.6 when building with Python 2])],[])
CFLAGS=$save_CFLAGS
AC_LANG_POP(C)
dnl FIXME Check if the Python library can be linked with, too?
dnl FIXME Check if the Python library can be linked with, too?
fi
;;
internal)
...
...
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