diff options
| author | wsnipex <wsnipex@a1.net> | 2014-03-23 10:22:04 +0100 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2014-04-27 18:05:12 +0200 |
| commit | 1419539fe1a056666baac01c80425294807ff087 (patch) | |
| tree | 1abf81716658cf325b4430568858a902050e7931 /tools/buildsteps | |
| parent | 01f1cfe2a92fcb8e6f7eafee621eb4274425736c (diff) | |
[depends] add --with-platform=raspberry-pi switch
Diffstat (limited to 'tools/buildsteps')
| -rw-r--r-- | tools/buildsteps/defaultenv | 2 | ||||
| -rwxr-xr-x | tools/buildsteps/rbpi/configure-depends | 22 |
2 files changed, 3 insertions, 21 deletions
diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index 567d66cfce..0d14e16a89 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -45,7 +45,7 @@ case $XBMC_PLATFORM_DIR in ;; rbpi) - JENKINS_RBPI_DEVENV=/home/jenkins/rbpi-dev + JENKINS_RBPI_DEVENV=${JENKINS_RBPI_DEVENV:-"/home/jenkins/rbpi-dev"} DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" ;; diff --git a/tools/buildsteps/rbpi/configure-depends b/tools/buildsteps/rbpi/configure-depends index 43d7c1fa17..556469f359 100755 --- a/tools/buildsteps/rbpi/configure-depends +++ b/tools/buildsteps/rbpi/configure-depends @@ -7,25 +7,7 @@ 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 \ - -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 \ - -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" \ - LDFLAGS="-L$JENKINS_RBPI_DEVENV/firmware/opt/vc/lib -lEGL -lGLESv2 -lbcm_host -lvcos \ - -lvchiq_arm" \ - ./configure --host=arm-linux-gnueabihf --prefix=$XBMC_DEPENDS_ROOT --with-tarballs=$TARBALLS \ + ./configure --with-platform=raspberry-pi --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 \ - -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" + --with-firmware=$JENKINS_RBPI_DEVENV/firmware --build=i686-linux fi |