From 909c9ef74356b6e9fdab91d90e36669718c01cfc Mon Sep 17 00:00:00 2001 From: Koki Shinjo Date: Thu, 12 Oct 2023 12:53:39 +0900 Subject: [PATCH 1/8] [cross] set make job num to CPU + 1 --- jsk_unitree_robot/cross/build_ros1.sh | 5 ++++- jsk_unitree_robot/cross/build_ros1_dependencies.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jsk_unitree_robot/cross/build_ros1.sh b/jsk_unitree_robot/cross/build_ros1.sh index e7d1cde8e0..27d52d2f32 100755 --- a/jsk_unitree_robot/cross/build_ros1.sh +++ b/jsk_unitree_robot/cross/build_ros1.sh @@ -1,10 +1,13 @@ #!/bin/bash +# From https://qiita.com/ymdymd/items/312c9f554d4ffb1f8dc6 +JOBS=$(($(grep cpu.cores /proc/cpuinfo | sort -u | sed 's/[^0-9]//g') + 1)) + TARGET_MACHINE="${TARGET_MACHINE:-arm64v8}" HOST_INSTALL_ROOT="${BASE_ROOT:-${PWD}}/"${TARGET_MACHINE}_System INSTALL_ROOT=System SOURCE_ROOT=${TARGET_MACHINE}_ws_system -MAKEFLAGS=${MAKEFLAGS:-'-j4'} +MAKEFLAGS=${MAKEFLAGS:-'-j'}${JOBS} UPDATE_SOURCE_ROOT=1 # TRUE if [ -e "${SOURCE_ROOT}" ]; then diff --git a/jsk_unitree_robot/cross/build_ros1_dependencies.sh b/jsk_unitree_robot/cross/build_ros1_dependencies.sh index 05f70d65ad..f250b7c824 100755 --- a/jsk_unitree_robot/cross/build_ros1_dependencies.sh +++ b/jsk_unitree_robot/cross/build_ros1_dependencies.sh @@ -1,10 +1,13 @@ #!/bin/bash +# From https://qiita.com/ymdymd/items/312c9f554d4ffb1f8dc6 +JOBS=$(($(grep cpu.cores /proc/cpuinfo | sort -u | sed 's/[^0-9]//g') + 1)) + TARGET_MACHINE="${TARGET_MACHINE:-arm64v8}" HOST_INSTALL_ROOT="${BASE_ROOT:-${PWD}}/"${TARGET_MACHINE}_System INSTALL_ROOT=System SOURCE_ROOT=${TARGET_MACHINE}_ws_ros1_dependencies_sources -MAKEFLAGS=${MAKEFLAGS:-'-j4'} +MAKEFLAGS=${MAKEFLAGS:-'-j'}${JOBS} if [ -e "${SOURCE_ROOT}" ]; then echo "WARNING: Source directory is found ${SOURCE_ROOT}" 1>&2 From d57ead75f690600f2351508e2bfe15a328760b99 Mon Sep 17 00:00:00 2001 From: Koki Shinjo Date: Fri, 13 Oct 2023 10:06:17 +0900 Subject: [PATCH 2/8] [cross] adaptive job number --- jsk_unitree_robot/cross/build_ros1.sh | 9 +++++++-- jsk_unitree_robot/cross/build_ros1_dependencies.sh | 11 +++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/jsk_unitree_robot/cross/build_ros1.sh b/jsk_unitree_robot/cross/build_ros1.sh index 27d52d2f32..4779c1ecf3 100755 --- a/jsk_unitree_robot/cross/build_ros1.sh +++ b/jsk_unitree_robot/cross/build_ros1.sh @@ -1,7 +1,12 @@ #!/bin/bash -# From https://qiita.com/ymdymd/items/312c9f554d4ffb1f8dc6 -JOBS=$(($(grep cpu.cores /proc/cpuinfo | sort -u | sed 's/[^0-9]//g') + 1)) +if [[ "$OSTYPE" == "linux-gnu"* ]]; then + JOBS=$(cat /proc/cpuinfo | grep "processor" | wc -l) +elif [[ "$OSTYPE" == "darwin"* ]]; then + JOBS=$(sysctl -n hw.logicalcpu) +else + JOBS=8 +fi TARGET_MACHINE="${TARGET_MACHINE:-arm64v8}" HOST_INSTALL_ROOT="${BASE_ROOT:-${PWD}}/"${TARGET_MACHINE}_System diff --git a/jsk_unitree_robot/cross/build_ros1_dependencies.sh b/jsk_unitree_robot/cross/build_ros1_dependencies.sh index f250b7c824..097fbe89d4 100755 --- a/jsk_unitree_robot/cross/build_ros1_dependencies.sh +++ b/jsk_unitree_robot/cross/build_ros1_dependencies.sh @@ -1,7 +1,14 @@ #!/bin/bash -# From https://qiita.com/ymdymd/items/312c9f554d4ffb1f8dc6 -JOBS=$(($(grep cpu.cores /proc/cpuinfo | sort -u | sed 's/[^0-9]//g') + 1)) +IMAGE_NAME="${IMAGE_NAME:-ros1-unitree}" + +if [[ "$OSTYPE" == "linux-gnu"* ]]; then + JOBS=$(cat /proc/cpuinfo | grep "processor" | wc -l) +elif [[ "$OSTYPE" == "darwin"* ]]; then + JOBS=$(sysctl -n hw.logicalcpu) +else + JOBS=8 +fi TARGET_MACHINE="${TARGET_MACHINE:-arm64v8}" HOST_INSTALL_ROOT="${BASE_ROOT:-${PWD}}/"${TARGET_MACHINE}_System From beb9bc3c8d01f2519d383f48c4612ceab9c5b4b8 Mon Sep 17 00:00:00 2001 From: Koki Shinjo Date: Fri, 13 Oct 2023 10:16:54 +0900 Subject: [PATCH 3/8] [cross] echo JOBS and use it for vcs workers num --- jsk_unitree_robot/cross/build_ros1.sh | 6 ++++-- jsk_unitree_robot/cross/build_ros1_dependencies.sh | 2 ++ jsk_unitree_robot/cross/build_user.sh | 12 +++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/jsk_unitree_robot/cross/build_ros1.sh b/jsk_unitree_robot/cross/build_ros1.sh index 4779c1ecf3..37f7498dc4 100755 --- a/jsk_unitree_robot/cross/build_ros1.sh +++ b/jsk_unitree_robot/cross/build_ros1.sh @@ -8,6 +8,8 @@ else JOBS=8 fi +echo "NUM JOBS=${JOBS}" + TARGET_MACHINE="${TARGET_MACHINE:-arm64v8}" HOST_INSTALL_ROOT="${BASE_ROOT:-${PWD}}/"${TARGET_MACHINE}_System INSTALL_ROOT=System @@ -39,7 +41,7 @@ mkdir -p ${SOURCE_ROOT}/src mkdir -p ${HOST_INSTALL_ROOT}/ros1_inst if [ ${UPDATE_SOURCE_ROOT} -eq 1 ]; then - vcs import --force --retry 10 --shallow ${SOURCE_ROOT}/src < repos/roseus_no_window.repos + vcs import --force --workers ${JOBS} --retry 10 --shallow ${SOURCE_ROOT}/src < repos/roseus_no_window.repos for dir in euslisp jskeus; do ls ${SOURCE_ROOT}/src/$dir/patches/; rsync -avz ${SOURCE_ROOT}/src/$dir/patches/ ${SOURCE_ROOT}/src/$dir; done sed -i s@:{version}@0.0.0@ ${SOURCE_ROOT}/src/euslisp/package.xml ${SOURCE_ROOT}/src/jskeus/package.xml fi @@ -71,7 +73,7 @@ docker run -it --rm \ rospack list && \ cd ${SOURCE_ROOT} && \ [ ${UPDATE_SOURCE_ROOT} -eq 0 ] || ROS_PACKAGE_PATH=src:\$ROS_PACKAGE_PATH rosinstall_generator ${EUSCOLLADA_DEPENDS} ${ROSEUS_DEPENDS} ${ROSEUS_MONGO_DEPENDS} ${ROSEUS_SMACH_DEPENDS} ${JSK_ROBOT_STARTUP_DEPENDS} ${DIAGNOSTIC_AGGREGATOR} ${PR2EUS} --verbose --deps --rosdistro melodic --exclude RPP --depend-type buildtool buildtool_export build run | tee unitree_ros1_system.repos && \ - [ ${UPDATE_SOURCE_ROOT} -eq 0 ] || PYTHONPATH= vcs import --force --retry 10 --shallow src < unitree_ros1_system.repos && \ + [ ${UPDATE_SOURCE_ROOT} -eq 0 ] || PYTHONPATH= vcs import --force --workers ${JOBS} --retry 10 --shallow src < unitree_ros1_system.repos && \ [ ! -e pr2_mechanism-346.diff ] || OUT=\"\$(patch -p1 --forward --directory src/pr2_mechanism < pr2_mechanism-346.diff | tee /dev/tty)\" || echo \"\${OUT}\" | grep \"Skipping patch\" -q || (echo \"\$OUT\" && false) && \ catkin_make_isolated --install --install-space /opt/jsk/${INSTALL_ROOT}/ros1_inst -DCMAKE_BUILD_TYPE=Release \ -DCATKIN_ENABLE_TESTING=FALSE \ diff --git a/jsk_unitree_robot/cross/build_ros1_dependencies.sh b/jsk_unitree_robot/cross/build_ros1_dependencies.sh index 097fbe89d4..6a26abf3a1 100755 --- a/jsk_unitree_robot/cross/build_ros1_dependencies.sh +++ b/jsk_unitree_robot/cross/build_ros1_dependencies.sh @@ -10,6 +10,8 @@ else JOBS=8 fi +echo "NUM JOBS=${JOBS}" + TARGET_MACHINE="${TARGET_MACHINE:-arm64v8}" HOST_INSTALL_ROOT="${BASE_ROOT:-${PWD}}/"${TARGET_MACHINE}_System INSTALL_ROOT=System diff --git a/jsk_unitree_robot/cross/build_user.sh b/jsk_unitree_robot/cross/build_user.sh index f18831c411..b8dbbc94ac 100755 --- a/jsk_unitree_robot/cross/build_user.sh +++ b/jsk_unitree_robot/cross/build_user.sh @@ -1,5 +1,15 @@ #!/bin/bash +if [[ "$OSTYPE" == "linux-gnu"* ]]; then + JOBS=$(cat /proc/cpuinfo | grep "processor" | wc -l) +elif [[ "$OSTYPE" == "darwin"* ]]; then + JOBS=$(sysctl -n hw.logicalcpu) +else + JOBS=8 +fi + +echo "NUM JOBS=${JOBS}" + TARGET_MACHINE="${TARGET_MACHINE:-arm64v8}" HOST_INSTALL_ROOT="${BASE_ROOT:-${PWD}}/"${TARGET_MACHINE}_System INSTALL_ROOT=System @@ -35,7 +45,7 @@ for dir in $(find ${SOURCE_ROOT}/src/jsk_robot -maxdepth 1 -mindepth 1 -type d); done # add unitree repos -[ ${UPDATE_SOURCE_ROOT} -eq 0 ] || vcs import ${SOURCE_ROOT}/src < repos/unitree.repos +[ ${UPDATE_SOURCE_ROOT} -eq 0 ] || vcs import --workers ${JOBS} ${SOURCE_ROOT}/src < repos/unitree.repos # check if /proc/sys/fs/binfmt_misc/qemu-* is updated # See https://github.com/k-okada/jsk_robot/issues/61 From 0951a70ab79577c0b76420afde6920a7a1eb44eb Mon Sep 17 00:00:00 2001 From: Koki Shinjo Date: Fri, 13 Oct 2023 10:53:36 +0900 Subject: [PATCH 4/8] [cross] use JOBS for vcs import --- jsk_unitree_robot/cross/build_ros1_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsk_unitree_robot/cross/build_ros1_dependencies.sh b/jsk_unitree_robot/cross/build_ros1_dependencies.sh index 6a26abf3a1..60e1e39411 100755 --- a/jsk_unitree_robot/cross/build_ros1_dependencies.sh +++ b/jsk_unitree_robot/cross/build_ros1_dependencies.sh @@ -50,7 +50,7 @@ docker run -it --rm \ bash -c "\ set -xeuf -o pipefail && \ cd /home/user/ros1_dependencies_sources && \ - vcs import --skip-existing --retry 10 --shallow src < ros1_dependencies.repos && \ + vcs import --skip-existing --workers ${JOBS} --retry 10 --shallow src < ros1_dependencies.repos && \ for script_file in \$(ls /home/user/ros1_dependencies_build_scripts/|sort); do /home/user/ros1_dependencies_build_scripts/\$script_file || exit 1; done && \ From c40d1dcbaa14e340d9c0e0b43065ccd6a07d580f Mon Sep 17 00:00:00 2001 From: Koki Shinjo Date: Fri, 13 Oct 2023 11:03:00 +0900 Subject: [PATCH 5/8] [cross] execute dependencies building with JOBS number --- jsk_unitree_robot/cross/build_ros1_dependencies.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jsk_unitree_robot/cross/build_ros1_dependencies.sh b/jsk_unitree_robot/cross/build_ros1_dependencies.sh index 60e1e39411..8232be0640 100755 --- a/jsk_unitree_robot/cross/build_ros1_dependencies.sh +++ b/jsk_unitree_robot/cross/build_ros1_dependencies.sh @@ -51,9 +51,8 @@ docker run -it --rm \ set -xeuf -o pipefail && \ cd /home/user/ros1_dependencies_sources && \ vcs import --skip-existing --workers ${JOBS} --retry 10 --shallow src < ros1_dependencies.repos && \ - for script_file in \$(ls /home/user/ros1_dependencies_build_scripts/|sort); do - /home/user/ros1_dependencies_build_scripts/\$script_file || exit 1; - done && \ + export JOBS=${JOBS} && \ + ls /home/user/ros1_dependencies_build_scripts/ | sort | xargs -I{} -P${JOBS} bash -c '/home/user/ros1_dependencies_build_scripts/{}' && \ pip install -U --user pip && \ export PYTHONPATH=\"/opt/jsk/System/ros1_dependencies/lib/python2.7/site-packages\" && \ export PKG_CONFIG_PATH=\"/opt/jsk/${INSTALL_ROOT}/ros1_dependencies/lib/pkgconfig\" && \ From de35b4103106cdaf49fecd4974da3458c20fc76b Mon Sep 17 00:00:00 2001 From: Koki Shinjo Date: Sun, 15 Oct 2023 18:58:46 +0900 Subject: [PATCH 6/8] Revert "[cross] execute dependencies building with JOBS number" This reverts commit c40d1dcbaa14e340d9c0e0b43065ccd6a07d580f. --- jsk_unitree_robot/cross/build_ros1_dependencies.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jsk_unitree_robot/cross/build_ros1_dependencies.sh b/jsk_unitree_robot/cross/build_ros1_dependencies.sh index 8232be0640..60e1e39411 100755 --- a/jsk_unitree_robot/cross/build_ros1_dependencies.sh +++ b/jsk_unitree_robot/cross/build_ros1_dependencies.sh @@ -51,8 +51,9 @@ docker run -it --rm \ set -xeuf -o pipefail && \ cd /home/user/ros1_dependencies_sources && \ vcs import --skip-existing --workers ${JOBS} --retry 10 --shallow src < ros1_dependencies.repos && \ - export JOBS=${JOBS} && \ - ls /home/user/ros1_dependencies_build_scripts/ | sort | xargs -I{} -P${JOBS} bash -c '/home/user/ros1_dependencies_build_scripts/{}' && \ + for script_file in \$(ls /home/user/ros1_dependencies_build_scripts/|sort); do + /home/user/ros1_dependencies_build_scripts/\$script_file || exit 1; + done && \ pip install -U --user pip && \ export PYTHONPATH=\"/opt/jsk/System/ros1_dependencies/lib/python2.7/site-packages\" && \ export PKG_CONFIG_PATH=\"/opt/jsk/${INSTALL_ROOT}/ros1_dependencies/lib/pkgconfig\" && \ From d7d4fb9a92a8a1747987b35dee3db8a3559f9757 Mon Sep 17 00:00:00 2001 From: Koki Shinjo Date: Sun, 15 Oct 2023 19:10:55 +0900 Subject: [PATCH 7/8] [cross] Use JOBS for make and cmake in ros1_dependencies build --- jsk_unitree_robot/cross/build_ros1_dependencies.sh | 2 ++ .../ros1_dependencies_build_scripts/1001-urdfdom-headers | 3 ++- .../cross/ros1_dependencies_build_scripts/1002-urdfdom | 3 ++- .../cross/ros1_dependencies_build_scripts/1003-assimp | 3 ++- .../cross/ros1_dependencies_build_scripts/1004-colladadom | 3 ++- .../cross/ros1_dependencies_build_scripts/1005-yaml-cpp | 3 ++- .../cross/ros1_dependencies_build_scripts/1007-snappy | 3 ++- .../cross/ros1_dependencies_build_scripts/1008-opencv | 3 ++- .../cross/ros1_dependencies_build_scripts/1009-python-sip | 2 +- .../cross/ros1_dependencies_build_scripts/1024-liblcm | 2 +- .../cross/ros1_dependencies_build_scripts/1025-alsa-lib | 2 +- .../cross/ros1_dependencies_build_scripts/1026-db5 | 1 + .../1027-jack-audio-connection-kit | 2 +- .../cross/ros1_dependencies_build_scripts/1028-libportaudio2 | 2 +- .../cross/ros1_dependencies_build_scripts/1030-flac | 2 +- .../cross/ros1_dependencies_build_scripts/1031-libncurses | 2 +- .../cross/ros1_dependencies_build_scripts/1032-speech-tools | 1 + .../cross/ros1_dependencies_build_scripts/1033-festival | 1 + .../cross/ros1_dependencies_build_scripts/1034-festlex-cmu | 2 +- .../cross/ros1_dependencies_build_scripts/1037-mailutils | 2 +- .../cross/ros1_dependencies_build_scripts/1038-tcl | 2 +- .../cross/ros1_dependencies_build_scripts/1039-expect | 4 ++-- .../cross/ros1_dependencies_build_scripts/1040-openssl | 4 ++-- .../cross/ros1_dependencies_build_scripts/1041-libsasl | 2 +- .../cross/ros1_dependencies_build_scripts/1042-postfix | 2 +- .../cross/ros1_dependencies_build_scripts/1043-libccd-dev | 3 ++- .../cross/ros1_dependencies_build_scripts/1044-libfcl-dev | 3 ++- 27 files changed, 39 insertions(+), 25 deletions(-) diff --git a/jsk_unitree_robot/cross/build_ros1_dependencies.sh b/jsk_unitree_robot/cross/build_ros1_dependencies.sh index 60e1e39411..9e48524d0e 100755 --- a/jsk_unitree_robot/cross/build_ros1_dependencies.sh +++ b/jsk_unitree_robot/cross/build_ros1_dependencies.sh @@ -51,6 +51,8 @@ docker run -it --rm \ set -xeuf -o pipefail && \ cd /home/user/ros1_dependencies_sources && \ vcs import --skip-existing --workers ${JOBS} --retry 10 --shallow src < ros1_dependencies.repos && \ + export JOBS=${JOBS} && \ + export MAKEFLAGS=${MAKEFLAGS} && \ for script_file in \$(ls /home/user/ros1_dependencies_build_scripts/|sort); do /home/user/ros1_dependencies_build_scripts/\$script_file || exit 1; done && \ diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1001-urdfdom-headers b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1001-urdfdom-headers index 5c43882e1c..577c3d0203 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1001-urdfdom-headers +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1001-urdfdom-headers @@ -8,6 +8,7 @@ cd /home/user/ros1_dependencies_sources/build/urdfdom-headers cmake \ -DCMAKE_INSTALL_PREFIX=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies \ -DCMAKE_BUILD_TYPE=Release \ + -j ${JOBS} \ ../../src/urdfdom-headers/urdfdom_headers-1.0.0 -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1002-urdfdom b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1002-urdfdom index 30144b316e..0de59c56a5 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1002-urdfdom +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1002-urdfdom @@ -8,6 +8,7 @@ cd /home/user/ros1_dependencies_sources/build/urdfdom cmake \ -DCMAKE_INSTALL_PREFIX=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies \ -DCMAKE_BUILD_TYPE=Release \ + -j ${JOBS} \ ../../src/urdfdom/urdfdom-1.0.0 -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1003-assimp b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1003-assimp index acd3d11160..1d42af1fa8 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1003-assimp +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1003-assimp @@ -21,6 +21,7 @@ cmake \ -DBUILD_DOCS=OFF \ -DCMAKE_DEBUG_POSTFIX='' \ -DASSIMP_ENABLE_BOOST_WORKAROUND=OFF \ + -j ${JOBS} \ ${SOURCE_DIR} -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1004-colladadom b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1004-colladadom index 152fb4da51..38d10224e2 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1004-colladadom +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1004-colladadom @@ -25,6 +25,7 @@ cmake \ -DOPT_BUILD_PACKAGES=OFF \ -DOPT_BUILD_PACKAGE_DEFAULT=OFF \ -DOPT_DOUBLE_PRECISION=ON \ + -j ${JOBS} \ ${SOURCE_DIR} -make install +make install ${MAKEFLAGS] diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1005-yaml-cpp b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1005-yaml-cpp index 1fc3ddf698..6dbc7ae67a 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1005-yaml-cpp +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1005-yaml-cpp @@ -17,6 +17,7 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=ON \ -DYAML_CPP_BUILD_TOOLS=ON \ + -j ${JOBS} \ ${SOURCE_DIR} -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1007-snappy b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1007-snappy index fb065a0a23..82ac32009c 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1007-snappy +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1007-snappy @@ -16,6 +16,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=on \ + -j ${JOBS} \ ${SOURCE_DIR} -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1008-opencv b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1008-opencv index adccf09285..2ebadcccdd 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1008-opencv +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1008-opencv @@ -48,6 +48,7 @@ cmake \ -DWITH_OPENEXR=OFF \ -DPYTHON2_PACKAGES_PATH=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies/lib/python2.7/site-packages \ -DOPENCV_CONFIG_INSTALL_PATH=lib/cmake/OpenCV \ + -j ${JOBS} \ ${SOURCE_DIR} -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1009-python-sip b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1009-python-sip index dbeb077680..622510a822 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1009-python-sip +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1009-python-sip @@ -18,4 +18,4 @@ python \ -e /opt/jsk/${INSTALL_ROOT}/ros1_dependencies/include \ -b /opt/jsk/${INSTALL_ROOT}/ros1_dependencies/bin \ -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1024-liblcm b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1024-liblcm index 20022e923b..517f5647eb 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1024-liblcm +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1024-liblcm @@ -20,4 +20,4 @@ automake --add-missing autoconf ./configure --prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1025-alsa-lib b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1025-alsa-lib index 32bc8248f3..45a08fa3ba 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1025-alsa-lib +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1025-alsa-lib @@ -16,4 +16,4 @@ cd ${SOURCE_DIR} ./configure --prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1026-db5 b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1026-db5 index f82fb4fa88..7b00143648 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1026-db5 +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1026-db5 @@ -16,4 +16,5 @@ cd ${SOURCE_DIR}/build_unix ../dist/configure --prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies --build $(uname -m)-unknown-linux-gnu --enable-cxx --enable-compat185 +# Why j1? make -j1 install diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1027-jack-audio-connection-kit b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1027-jack-audio-connection-kit index 57e32c0585..0801f76cbb 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1027-jack-audio-connection-kit +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1027-jack-audio-connection-kit @@ -17,4 +17,4 @@ cd ${SOURCE_DIR} ./autogen.sh CFLAGS="-I/opt/jsk/${INSTALL_ROOT}/ros1_dependencies/include" LIBS="-L/opt/jsk/${INSTALL_ROOT}/ros1_dependencies/lib" ./configure --enable-force-install --prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1028-libportaudio2 b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1028-libportaudio2 index 9c6c607838..34451df6d7 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1028-libportaudio2 +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1028-libportaudio2 @@ -20,4 +20,4 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ ${SOURCE_DIR} -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1030-flac b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1030-flac index 5de19e6a74..55aea84069 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1030-flac +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1030-flac @@ -18,4 +18,4 @@ automake --add-missing autoconf ./configure --prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1031-libncurses b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1031-libncurses index bdcab81e05..2b8ea5d71a 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1031-libncurses +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1031-libncurses @@ -14,4 +14,4 @@ cd ${SOURCE_DIR} ./configure --prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies -with-shared -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1032-speech-tools b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1032-speech-tools index c2447e8fd6..0d1f31ff4d 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1032-speech-tools +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1032-speech-tools @@ -30,6 +30,7 @@ export PROJECT_MAJOR_VERSION=2 ./configure --prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies +# Why j1? make -j1 PULSEAUDIO=none cp lib/*.a /opt/jsk/${INSTALL_ROOT}/ros1_dependencies/lib diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1033-festival b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1033-festival index 8060ba8551..bd2e2a242b 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1033-festival +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1033-festival @@ -28,6 +28,7 @@ libtoolize autoconf ./configure --prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies +# Why j1 ? EST="../speech_tools" make -j1 all cp src/main/festival src/main/festival_client bin/text2wave /opt/jsk/${INSTALL_ROOT}/ros1_dependencies/bin/ diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1034-festlex-cmu b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1034-festlex-cmu index b4b8296a47..ea92e027d4 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1034-festlex-cmu +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1034-festlex-cmu @@ -14,7 +14,7 @@ fi ## cd ${SOURCE_DIR} -make -C lib/dicts/cmu +make -C lib/dicts/cmu ${MAKEFLAGS} mkdir -p /opt/jsk/${INSTALL_ROOT}/ros1_dependencies/share/festival/dicts/cmu cp lib/dicts/cmu/cmudict-*.out /opt/jsk/${INSTALL_ROOT}/ros1_dependencies/share/festival/dicts/cmu diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1037-mailutils b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1037-mailutils index 510b004c88..5fc0b08bf3 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1037-mailutils +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1037-mailutils @@ -16,4 +16,4 @@ cd ${SOURCE_DIR} ./configure --prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1038-tcl b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1038-tcl index 5b6401803e..030cd72e60 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1038-tcl +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1038-tcl @@ -16,4 +16,4 @@ cd ${SOURCE_DIR} ./configure --prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1039-expect b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1039-expect index e4b0174705..15f1e4f418 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1039-expect +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1039-expect @@ -16,5 +16,5 @@ cd ${SOURCE_DIR} ./configure --prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies --build=arm --verbose --enable-shared --exec-prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies -make -make install +make ${MAKEFLAGS} +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1040-openssl b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1040-openssl index faeec7fe7b..6f2fdee8b2 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1040-openssl +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1040-openssl @@ -7,8 +7,8 @@ cd ${SOURCE_DIR} ./config --prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies --openssldir=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies/openssl -make -make install +make ${MAKEFLAGS} +make install ${MAKEFLAGS} # download pem (ssl.get_default_verify_paths) wget https://curl.haxx.se/ca/cacert.pem -O /opt/jsk/${INSTALL_ROOT}/ros1_dependencies/openssl/cert.pem diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1041-libsasl b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1041-libsasl index 848fae1a9d..8ee32088ea 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1041-libsasl +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1041-libsasl @@ -7,4 +7,4 @@ cd ${SOURCE_DIR} ./configure --prefix=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1042-postfix b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1042-postfix index 684cc07f05..90a379afdd 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1042-postfix +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1042-postfix @@ -21,7 +21,7 @@ make makefiles \ -I${INSTALL_DIR}/include/openssl" \ AUXLIBS="-L${INSTALL_DIR}/lib -L${INSTALL_DIR}/lib/sasl2 -L${INSTALL_DIR}/openssl -lsasl2 -lssl -lcrypto -lz -lm" -make +make ${MAKEFLAGS} LD_LIBRARY_PATH="${INSTALL_DIR}"/lib "${INSTALL_DIR}"/bin/expect -c " set timeout 100 spawn make install diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1043-libccd-dev b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1043-libccd-dev index 4f92e0fb15..dcf705e4ec 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1043-libccd-dev +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1043-libccd-dev @@ -18,6 +18,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX=/opt/jsk/${INSTALL_ROOT}/ros1_dependencies \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ + -j ${JOBS} \ ${SOURCE_DIR} -make install +make install ${MAKEFLAGS} diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1044-libfcl-dev b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1044-libfcl-dev index 82b8448b83..2db64bcda7 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1044-libfcl-dev +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1044-libfcl-dev @@ -16,6 +16,7 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DFCL_BUILD_TESTS=FALSE \ + -j ${JOBS} \ ${SOURCE_DIR} -make install +make install ${MAKEFLAGS} From cbbb1a04b32fe0b3c89fcbcc47d54170f992392e Mon Sep 17 00:00:00 2001 From: Koki Shinjo Date: Sun, 15 Oct 2023 19:20:06 +0900 Subject: [PATCH 8/8] [cross] revert JOBS use for 1004-colladadom --- .../cross/ros1_dependencies_build_scripts/1004-colladadom | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1004-colladadom b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1004-colladadom index 38d10224e2..aadae142e2 100755 --- a/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1004-colladadom +++ b/jsk_unitree_robot/cross/ros1_dependencies_build_scripts/1004-colladadom @@ -25,7 +25,7 @@ cmake \ -DOPT_BUILD_PACKAGES=OFF \ -DOPT_BUILD_PACKAGE_DEFAULT=OFF \ -DOPT_DOUBLE_PRECISION=ON \ - -j ${JOBS} \ ${SOURCE_DIR} -make install ${MAKEFLAGS] +# ${MAKEFLAGS} causes error? +make install