README.cross | 26 +++++++++++++++++--------- solenv/bin/make-raspbian-root-tarball | 2 ++ 2 files changed, 19 insertions(+), 9 deletions(-)
New commits: commit 78a61583c266a1fd222cd78c912e35e93f7010d3 Author: Tor Lillqvist <[email protected]> Date: Mon Jan 20 15:01:25 2014 +0200 Minor update for Raspbian Change-Id: I5208aa7e6f40acc6d18a0617dc104474e1e87870 diff --git a/README.cross b/README.cross index 2d133eb..6cbea22 100644 --- a/README.cross +++ b/README.cross @@ -386,28 +386,36 @@ Raspbian In theory, this should work also for another Linux, it does not need to be Raspbian. But this cross-compilation work is tested from Debian based system to Raspbian. -You will need Raspbian's pkg-config files and system libraries to build against. -Available at http://dev-www.libreoffice.org/extern/raspbian_rootfs.tar.bz2 -$ wget http://dev-www.libreoffice.org/extern/raspbian_rootfs.tar.bz2 -$ tar -xf raspbian_rootfs.tar.bz2 +You will need headers, pkg-config files and libraries from a Raspbian +system to build against. Available at +http://dev-www.libreoffice.org/extern/ . Look for the latest +raspbian-root-*.tar.gz . For instance: + +$ wget http://dev-www.libreoffice.org/extern/raspbian-root-20140120.tar.gz +$ mkdir raspbian-root +$ cd raspbian-root +$ tar -xf raspbian-root-20140120.tar.gz You can build cross-compiler yourself or get the executables here: $ git clone git://github.com/raspberrypi/tools + tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian is known to work. Then create pkg-config wrapper, something like: $ cat > pkg-config-wrapper-host << _EOF #!/bin/sh -SYSROOT=<path-to-raspbian_rootfs> - -export PKG_CONFIG_DIR= -export PKG_CONFIG_LIBDIR=\${SYSROOT}/usr/lib/pkgconfig:\${SYSROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig:\${SYSROOT}/usr/share/pkgconfig -export PKG_CONFIG_SYSROOT_DIR=\${SYSROOT} +if [ "$CROSS_COMPILING" = YES ]; then + SYSROOT=$HOME/lo/raspbian-root + export PKG_CONFIG_PATH=${SYSROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig:${SYSROOT}/usr/share/pkgconfig + export PKG_CONFIG_LIBDIR=${SYSROOT}/usr/lib/pkgconfig + export PKG_CONFIG_SYSROOT_DIR=${SYSROOT} +fi exec pkg-config "\$@" _EOF $ chmod +x pkg-config-wrapper-host + This does not work with pkg-config 0.23. 0.26 is known to work. And you are ready to build with autogen.input similar to: commit 6e08873d98add4375d9d72057b9226d3bbc272fe Author: Tor Lillqvist <[email protected]> Date: Mon Jan 20 15:00:11 2014 +0200 Add JVM headers and libs Change-Id: If5524c6c23bcd2500d029a33df141a0a1c611502 diff --git a/solenv/bin/make-raspbian-root-tarball b/solenv/bin/make-raspbian-root-tarball index 38a64e2..a6540e9 100755 --- a/solenv/bin/make-raspbian-root-tarball +++ b/solenv/bin/make-raspbian-root-tarball @@ -48,6 +48,8 @@ find lib/*.so* \ usr/lib/liblpsolve*.a \ usr/lib/*.so* \ usr/lib/arm-linux-gnueabihf \ + usr/lib/jvm/java-6-openjdk-armhf/include \ + usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm \ usr/lib/pkgconfig \ usr/share/pkgconfig \ -type f -o -type l | _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
