From 5f14e389a2d90456421ecaa2e513dae0f827e26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 15 Jul 2013 17:30:16 +0200 Subject: [PATCH] libreoffice: configure fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...-remove-special-cross-code-for-Pyuno.patch | 83 +++++++++++++++++++ recipes-libreoffice/libreoffice_4.1.0.2.bb | 21 +++-- 2 files changed, 98 insertions(+), 6 deletions(-) create mode 100644 recipes-libreoffice/libreoffice/0002-configure.ac-remove-special-cross-code-for-Pyuno.patch diff --git a/recipes-libreoffice/libreoffice/0002-configure.ac-remove-special-cross-code-for-Pyuno.patch b/recipes-libreoffice/libreoffice/0002-configure.ac-remove-special-cross-code-for-Pyuno.patch new file mode 100644 index 0000000..84477bd --- /dev/null +++ b/recipes-libreoffice/libreoffice/0002-configure.ac-remove-special-cross-code-for-Pyuno.patch @@ -0,0 +1,83 @@ +From 22ae425b34775feb015eae7bea113ce15f3cce4d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 15 Jul 2013 17:13:33 +0200 +Subject: [PATCH] configure.ac: remove special cross code for Pyuno +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [configuration specific] + +Signed-off-by: Andreas Müller +--- + configure.ac | 33 +++------------------------------ + 1 files changed, 3 insertions(+), 30 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0818adf..8d63c3c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7380,7 +7380,7 @@ if test $enable_python = system; then + # Fallback: Accept these in the environment, or as set above + # for MacOSX. + : +- elif test "$cross_compiling" != yes; then ++ else + # Unset variables set by the above AM_PATH_PYTHON so that + # we actually do check anew. + unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir +@@ -7400,33 +7400,6 @@ if test $enable_python = system; then + PYTHON_CFLAGS="-I$python_include" + PYTHON_LIBS="-L$python_libdir -lpython$python_version $python_libs" + fi +- else +- dnl How to find out the cross-compilation Python installation path? +- dnl Let's hardocode what we know for different distributions for now... +- for python_version in 2.6; do +- if test -f ${MINGW_SYSROOT}/include/python${python_version}/Python.h; then +- PYTHON_CFLAGS="-I${MINGW_SYSROOT}/include/python$python_version" +- PYTHON_LIBS="-L${MINGW_SYSROOT}/lib -lpython$python_version $python_libs" +- AC_MSG_CHECKING([for python.exe]) +- libo_MINGW_CHECK_DLL([libpython$python_version]) +- libo_MINGW_CHECK_DLL([libreadline6]) +- libo_MINGW_CHECK_DLL([libtermcap]) +- # could we somehow extract the really mingw python version from +- # actual distro package? +- # 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_VERSION_MAJOR=`echo $python_version | cut -d . -f 1` +- PYTHON_VERSION_MINOR=`echo $python_version | cut -d . -f 2` +- break +- fi +- done +- AC_MSG_CHECKING([for python version]) +- AS_IF([test -n "$PYTHON_VERSION"], +- [AC_MSG_RESULT([$PYTHON_VERSION])], +- [AC_MSG_RESULT([not found]) +- AC_MSG_ERROR([no usable python found])]) +- test -n "$PYTHON_CFLAGS" && break + fi + # let the PYTHON_FOR_BUILD match the same python installation that + # provides PYTHON_CFLAGS/PYTHON_LDFLAGS for pyuno, which should be +@@ -7439,7 +7412,7 @@ case $enable_python in + system) + SYSTEM_PYTHON=YES + +- if test "$CROSS_COMPILING" != YES; then ++# if test "$CROSS_COMPILING" != YES; then + dnl Check if the headers really work + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" +@@ -7464,7 +7437,7 @@ int main(int argc, char **argv) { + AC_LANG_POP(C) + + dnl FIXME Check if the Python library can be linked with, too? +- fi ++# fi + ;; + + internal) +-- +1.7.6.5 + diff --git a/recipes-libreoffice/libreoffice_4.1.0.2.bb b/recipes-libreoffice/libreoffice_4.1.0.2.bb index 923b817..a7bdd94 100644 --- a/recipes-libreoffice/libreoffice_4.1.0.2.bb +++ b/recipes-libreoffice/libreoffice_4.1.0.2.bb @@ -5,18 +5,27 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = " \ http://download.documentfoundation.org/libreoffice/src/4.1.0/libreoffice-${PV}.tar.xz \ file://0001-configure.ac-remove-cross-compile-section-ist-does-n.patch \ + file://0002-configure.ac-remove-special-cross-code-for-Pyuno.patch \ " SRC_URI[md5sum] = "fd49e3518a91761dc9f7129476e60f19" SRC_URI[sha256sum] = "38daadf5da5f69962b12a9e4d36ad830d122ebab505aa6be19ca8ed780a8f776" -inherit autotools perlnative +inherit autotools pkgconfig perlnative pythonnative -DEPENDS = "cups ccache-native" +DEPENDS = "python-lxml-native ccache-native archive-zip-native gperf-native bison-native" +DEPENDS += "cups zlib jpeg libxml2 libxslt" + +# necessary to let the call for python-config succeed +export BUILD_SYS +export HOST_SYS +export STAGING_LIBDIR +export STAGING_INCDIR EXTRA_OECONF = " \ - --with-gcc-home=${TOOLCHAIN_PATH} \ + --with-gcc-home=${TOOLCHAIN_PATH} \ + --without-java \ + --without-doxygen \ " -#do_configure_prepend() { -# export CC="${CC}" -#} +# for scripting +RDEPENDS_${PN} = "python"