aboutsummaryrefslogtreecommitdiff
path: root/cmake/scripts
diff options
context:
space:
mode:
authorfuzzard <fuzzard@kodi.tv>2022-11-10 22:10:44 +1000
committerfuzzard <fuzzard@kodi.tv>2022-11-10 22:10:44 +1000
commit3e55e4f1e18741af39f057ea446c5b98343c0ea0 (patch)
tree73acfed385862e9a28e752c4c84e4ea8c02abc8a /cmake/scripts
parentd0792c8d79ebe8ff22671d192c548b7472e6a2f4 (diff)
[cmake][android] explicitly set j1 for android targets apk/obb/apk-obb/apk-clean
Currently jenkins throws this message for these targets 18:59:59 make[4]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. which effectively forces them to run as -j1. On macos (GNU Make 3.81) if i run multi threaded, it doesnt fall back to -j1, but instead throws errors like the following [100%] Built target bundle cp: directory xbmc/obj/local/arm64-v8a does not exist make[4]: *** [libs] Error 1 make[4]: *** Waiting for unfinished jobs.... rm: assets/addons/metadata.generic.artists/resources/language: Permission denied rm: assets/addons/metadata.generic.artists/resources: Permission denied rm: assets/addons/metadata.generic.artists: Permission denied rm: assets/addons: Permission denied rm: assets: Permission denied make[4]: *** [apk-clean] Error 1 cp: directory xbmc/res/values does not exist make[4]: *** [res] Error 1 make[3]: *** [CMakeFiles/apk] Error 2 make[2]: *** [CMakeFiles/apk.dir/all] Error 2 make[1]: *** [CMakeFiles/apk.dir/rule] Error 2 Forcing j1 on these targets only reduces the final Makefile for packaing to run as j1, but the rest of the build (main app/lib and there dependencies) as whatever is requested
Diffstat (limited to 'cmake/scripts')
-rw-r--r--cmake/scripts/android/Install.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake
index f1904cf11f..bbe5ea0bb8 100644
--- a/cmake/scripts/android/Install.cmake
+++ b/cmake/scripts/android/Install.cmake
@@ -152,7 +152,7 @@ if(CPU MATCHES i686)
endif()
foreach(target apk obb apk-obb apk-clean)
add_custom_target(${target}
- COMMAND env PATH=${NATIVEPREFIX}/bin:$ENV{PATH} ${CMAKE_MAKE_PROGRAM}
+ COMMAND env PATH=${NATIVEPREFIX}/bin:$ENV{PATH} ${CMAKE_MAKE_PROGRAM} -j1
-C ${CMAKE_BINARY_DIR}/tools/android/packaging
CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}
CC=${CMAKE_C_COMPILER}