--- xbmc-24032014.orig/tools/buildsteps/rbpi/configure-depends	2014-03-24 15:52:53.000000000 +0100
+++ xbmc-24032014/tools/buildsteps/rbpi/configure-depends	2014-03-26 17:01:29.544260826 +0100
@@ -7,13 +7,13 @@ then
   cd $WORKSPACE/tools/depends;
 
   PATH="$PATH:$JENKINS_RBPI_DEVENV/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin" \
-  CFLAGS="-pipe -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard \
-  -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated \
+  CFLAGS="\
+  -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated \
   -Wno-deprecated-declarations -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include \
   -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vcos/pthreads \
   -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vmcs_host/linux" \
-  CXXFLAGS="-pipe -mcpu=arm1176jzf-s -mtune=arm1176jzf-s \
-  -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux -Wno-psabi \
+  CXXFLAGS="\
+  -mabi=aapcs-linux -Wno-psabi \
   -Wa,-mno-warn-deprecated -Wno-deprecated-declarations \
   -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include \
   -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vcos/pthreads \
@@ -23,8 +23,8 @@ then
   ./configure --host=arm-linux-gnueabihf --prefix=$XBMC_DEPENDS_ROOT --with-tarballs=$TARBALLS \
     --with-toolchain=$JENKINS_RBPI_DEVENV/tools/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/sysroot \
     --build=i686-linux \
-      CFLAGS="-pipe -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard \
-      -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated \
+      CFLAGS="\
+      -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated \
       -Wno-deprecated-declarations -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include \
       -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vcos/pthreads \
       -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vmcs_host/linux"