--- /usr/portage/media-tv/kodi/kodi-16.0.ebuild	2016-03-02 18:36:00.000000000 +0100
+++ /tmp/kodi-16.0.ebuild	2016-08-06 17:03:42.687664191 +0200
@@ -177,7 +177,30 @@
 	multijob_finish
 	elibtoolize
 
-	if [[ ${PV} == "9999" ]] || use java ; then #558798
+	# Cross-compiler support
+	# We need JsonSchemaBuilder and TexturePacker binaries for the host system
+	# Later we need libsquish for the target system
+	if tc-is-cross-compiler ; then
+		mkdir "${WORKDIR}"/${CBUILD}
+		pushd "${WORKDIR}"/${CBUILD} >/dev/null
+		einfo "Building host tools"
+		cp -a $S/{tools,xbmc} ./
+		local tools=(JsonSchemaBuilder)
+		use texturepacker && tools+=(TexturePacker)
+		einfo ${tools[@]}
+		for tool in ${tools[@]} ; do
+			tc-env_build emake -C tools/depends/native/$tool
+			mkdir $S/tools/depends/native/$tool/bin
+			ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool $S/tools/depends/native/$tool/bin/$tool
+		done
+		popd >/dev/null
+
+		emake -f codegenerator.mk
+
+		# Binary kodi.bin links against libsquish,
+		# so we need libsquish compiled for the target system
+		emake -C tools/depends/native/libsquish-native/ CXX=$(tc-getCXX)
+	elif [[ ${PV} == "9999" ]] || use java ; then #558798
 		tc-env_build emake -f codegenerator.mk
 	fi