[build, fix] Support PocketBook TC in path (#765)

Fixes #764.

* [CI] skip pocketbook-toolchain target

* don't overwrite outside definition of POCKETBOOK_TOOLCHAIN

.ci/build_script.sh

@@ -24,7 +24,7 @@ elif [ "$TARGET" = "pocketbook" ]; then
     docker run -t \
         -v "${HOME}/.ccache:${DOCKER_HOME}/.ccache" \
         -v "$(pwd):${DOCKER_HOME}/base" "${DOCKER_IMG}" \
-        /bin/bash -c "source /home/ko/.bashrc && cd /home/ko/base && sudo chown -R ko:ko . && make pocketbook-toolchain && make VERBOSE=1 TARGET=pocketbook all"
+        /bin/bash -c "source /home/ko/.bashrc && cd /home/ko/base && sudo chown -R ko:ko . && make VERBOSE=1 TARGET=pocketbook all"
 elif [ "$TARGET" = "sony-prstux" ]; then
     sudo chmod -R 777 "${HOME}/.ccache"
     docker run -t \

.travis.yml

@@ -20,7 +20,7 @@ env:
     - EMULATE_READER=1 CC=clang
     - TARGET=kindle DOCKER_IMG=frenzie/kokindle:0.1.0
     - TARGET=kobo DOCKER_IMG=frenzie/kokobo:0.1.0
-    - TARGET=pocketbook DOCKER_IMG=frenzie/kopb:0.1.0
+    - TARGET=pocketbook DOCKER_IMG=frenzie/kopb:0.1.1
     - TARGET=sony-prstux DOCKER_IMG=phreakuencies/prstux-dev:16.04
     - TARGET=cervantes DOCKER_IMG=frenzie/kocervantes:0.1.0
     # ANDROID_ARCH=x86 is currently broken on these older NDKs (at least on Travis), so no point in testing it

Makefile.defs

@@ -12,7 +12,7 @@ UNAME:=$(shell uname -s)
 # use MAKEFILE_DIR instead of CURDIR for variables that are exported through -include
 MAKEFILE_DIR=$(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 TOOLCHAIN_DIR=$(MAKEFILE_DIR)toolchain
-POCKETBOOK_TOOLCHAIN=$(TOOLCHAIN_DIR)/pocketbook-toolchain
+POCKETBOOK_TOOLCHAIN?=$(TOOLCHAIN_DIR)/pocketbook-toolchain
 ANDROID_ARCH?=arm
 ANDROID_TOOLCHAIN=$(TOOLCHAIN_DIR)/android-toolchain-$(ANDROID_ARCH)
 NDK?=$(TOOLCHAIN_DIR)/android-ndk-r15c
@@ -90,8 +90,11 @@ else ifeq ($(TARGET), pocketbook)
 	CHOST?=arm-obreey-linux-gnueabi
 	export LEGACY=1
 	export POCKETBOOK=1
-	export PATH:=$(POCKETBOOK_TOOLCHAIN)/bin:$(PATH)
-	export SYSROOT=$(POCKETBOOK_TOOLCHAIN)/arm-obreey-linux-gnueabi/sysroot
+	HAS_POCKETBOOK_TC:=$(shell command -v arm-obreey-linux-gnueabi-gcc 2> /dev/null)
+	ifndef HAS_POCKETBOOK_TC
+		export PATH:=$(POCKETBOOK_TOOLCHAIN)/bin:$(PATH)
+		export SYSROOT=$(POCKETBOOK_TOOLCHAIN)/arm-obreey-linux-gnueabi/sysroot
+	endif
 else ifeq ($(TARGET), sony-prstux)
 	CHOST?=arm-linux-gnueabihf
 	export SONY_PRSTUX=1