diff options
| -rw-r--r-- | docs/README.raspberrypi | 15 | ||||
| -rwxr-xr-x | tools/buildsteps/rbpi/configure-depends | 4 | ||||
| -rw-r--r-- | tools/depends/README | 2 | ||||
| -rw-r--r-- | tools/depends/target/Toolchain.cmake.in | 2 |
4 files changed, 8 insertions, 15 deletions
diff --git a/docs/README.raspberrypi b/docs/README.raspberrypi index 7eaa64f425..3b222a60ae 100644 --- a/docs/README.raspberrypi +++ b/docs/README.raspberrypi @@ -26,7 +26,7 @@ build for the first Raspberry Pi, the commands have to be adapted to use $ sudo apt-get install git autoconf curl g++ zlib1g-dev libcurl4-openssl-dev gawk gperf libtool autopoint swig default-jre $ git clone https://github.com/raspberrypi/tools - $ sudo cp -r tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64 /opt + $ sudo cp -r tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf /opt $ git clone https://github.com/raspberrypi/firmware $ sudo mkdir -p /opt/bcm-rootfs/opt @@ -39,10 +39,9 @@ build for the first Raspberry Pi, the commands have to be adapted to use $ cd xbmc/tools/depends $ ./bootstrap - $ PATH="$PATH:/opt/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin" \ - ./configure --host=arm-linux-gnueabihf \ + $ ./configure --host=arm-linux-gnueabihf \ --prefix=/opt/kodi-bcm/kodi-dbg \ - --with-toolchain=/usr/local/bcm-gcc/arm-bcm2708hardfp-linux-gnueabi/sysroot \ + --with-toolchain=/opt/arm-rpi-4.9.3-linux-gnueabihf \ --with-firmware=/opt/bcm-rootfs \ --with-platform=raspberry-pi2 \ --build=i686-linux @@ -50,13 +49,7 @@ build for the first Raspberry Pi, the commands have to be adapted to use $ make $ cd ../.. - CONFIG_EXTRA="--with-platform=raspberry-pi2 \ - --enable-libcec --enable-player=omxplayer \ - --disable-x11 --disable-xrandr --disable-openmax \ - --disable-optical-drive --disable-dvdcss --disable-joystick \ - --disable-crystalhd --disable-vtbdecoder --disable-vaapi \ - --disable-vdpau --enable-alsa" \ - make -C tools/depends/target/cmakebuildsys + $ make -C tools/depends/target/cmakebuildsys $ cd build $ make $ sudo make install diff --git a/tools/buildsteps/rbpi/configure-depends b/tools/buildsteps/rbpi/configure-depends index b1fb8a6b27..ac7a691af4 100755 --- a/tools/buildsteps/rbpi/configure-depends +++ b/tools/buildsteps/rbpi/configure-depends @@ -6,7 +6,7 @@ if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then cd $WORKSPACE/tools/depends; - PATH="$PATH:$JENKINS_RBPI_DEVENV/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin" \ ./configure --with-platform=raspberry-pi --host=arm-linux-gnueabihf --prefix=$XBMC_DEPENDS_ROOT --with-tarballs=$TARBALLS \ - --with-firmware=$JENKINS_RBPI_DEVENV/firmware --build=i686-linux $DEBUG_SWITCH + --with-firmware=$JENKINS_RBPI_DEVENV/firmware --build=i686-linux $DEBUG_SWITCH \ + --with-toolchain=$JENKINS_RBPI_DEVENV/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf fi diff --git a/tools/depends/README b/tools/depends/README index 5a273d38f5..d61cf59cb5 100644 --- a/tools/depends/README +++ b/tools/depends/README @@ -37,7 +37,7 @@ TVOS: ./configure --with-toolchain=/opt/toolchains/my-example-toolchain/ --prefix=/opt/xbmc-deps --host=arm-linux-gnueabi RASPBERRY-PI: - PATH="/opt/rbp-dev/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin:$PATH" ./configure --with-platform=raspberry-pi --host=arm-linux-gnueabihf --prefix=/opt/xbmc-deps --with-tarballs=/opt/xbmc-tarballs --with-toolchain=/opt/rbp-dev/tools/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/sysroot --with-firmware=/opt/rbp-dev/firmware --build=i686-linux + ./configure --with-platform=raspberry-pi --host=arm-linux-gnueabihf --prefix=/opt/xbmc-deps --with-tarballs=/opt/xbmc-tarballs --with-toolchain=/opt/rbp-dev/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf --with-firmware=/opt/rbp-dev/firmware --build=i686-linux Native toolchain ./configure --with-toolchain=/usr --prefix=/opt/xbmc-deps --host=x86_64-linux-gnu diff --git a/tools/depends/target/Toolchain.cmake.in b/tools/depends/target/Toolchain.cmake.in index 40c3e356aa..59db66b4e9 100644 --- a/tools/depends/target/Toolchain.cmake.in +++ b/tools/depends/target/Toolchain.cmake.in @@ -63,7 +63,7 @@ endif() set(CMAKE_FIND_ROOT_PATH @prefix@/@deps_dir@) set(CMAKE_LIBRARY_PATH @prefix@/@deps_dir@/lib) if(NOT "@use_toolchain@" STREQUAL "") - list(APPEND CMAKE_FIND_ROOT_PATH @use_toolchain@ @use_toolchain@/usr @use_toolchain@/sysroot/usr) + list(APPEND CMAKE_FIND_ROOT_PATH @use_toolchain@ @use_toolchain@/@use_host@ @use_toolchain@/@use_host@/sysroot @use_toolchain@/@use_host@/sysroot/usr @use_toolchain@/@use_host@/libc @use_toolchain@/lib/@use_host@/sysroot @use_toolchain@/usr @use_toolchain@/sysroot/usr) set(CMAKE_LIBRARY_PATH "${CMAKE_LIBRARY_PATH}:@use_toolchain@/usr/lib/@use_host@:@use_toolchain@/lib/@use_host@") endif() if(NOT "@use_sdk_path@" STREQUAL "") |