changeset 4254:f853a40fed0e

RT-31554 Include /usr/include/ft2build.h in armv6hf crosslibs
author Daniel Blaukopf <daniel.blaukopf@oracle.com>
date Wed, 10 Jul 2013 22:24:38 +0300
parents f2a21ec4a98d
children 35a82a42d440
files buildSrc/armv6hf.gradle buildSrc/crosslibs/crosslibs-armv6hf.sh
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/buildSrc/armv6hf.gradle	Wed Jul 10 10:45:09 2013 -0700
+++ b/buildSrc/armv6hf.gradle	Wed Jul 10 22:24:38 2013 +0300
@@ -26,12 +26,12 @@
 ext.ARMV6HF = [:]
 
 fetchExternalTools('ARMV6HF', 
-  ["armhf-raspberry-pi-08.tgz",
+  ["armhf-raspberry-pi-09.tgz",
    "gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux.tgz" ], 
   rootProject.CROSS_TOOLS_DIR, rootProject.IMPORT_CROSS_TOOLS)
 
 // Define the location of the sdk and toolchain
-def sdk=file("${rootProject.CROSS_TOOLS_DIR}/armhf-raspberry-pi-08")
+def sdk=file("${rootProject.CROSS_TOOLS_DIR}/armhf-raspberry-pi-09")
 def compilerHome=file("${rootProject.CROSS_TOOLS_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux")
 
 // Declare whether this particular target file applies to the current system
--- a/buildSrc/crosslibs/crosslibs-armv6hf.sh	Wed Jul 10 10:45:09 2013 -0700
+++ b/buildSrc/crosslibs/crosslibs-armv6hf.sh	Wed Jul 10 22:24:38 2013 +0300
@@ -92,6 +92,7 @@
         usr/include/directfb \
         usr/include/fontconfig \
         usr/include/freetype2 \
+        usr/include/ft2build.h \
         usr/include/gdk-pixbuf-2.0/ \
         usr/include/gio-unix-2.0/ \
         usr/include/glib-2.0 \
@@ -216,7 +217,7 @@
 
 mkdir -p $CROSSLIBS || exit 1
 
-PILIBS=$CROSSLIBS/armhf-raspberry-pi-08
+PILIBS=$CROSSLIBS/armhf-raspberry-pi-09
 
 checkReinstall $PILIBS
 if [[ ! -d $PILIBS ]]; then