Applying all patches inside patches directory #79
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Abort script on any failures | ||
| set -e | ||
|
|
||
| my_loc="$(cd "$(dirname $0)" && pwd)" | ||
| source $my_loc/config.sh | ||
| source $my_loc/utils.sh | ||
|
|
||
| if [ $# != 2 ] || [ $1 == '-h' ] || [ $1 == '--help' ]; then | ||
| echo "Usage: $0 patch_prefix output_prefix" | ||
| echo " example: $0 /home/user/ros_android/patches /home/user/my_workspace/output" | ||
| exit 1 | ||
| fi | ||
|
|
||
| patch_prefix=$1 | ||
| output_prefix=$2 | ||
|
|
||
| echo | ||
| echo -e '\e[34mApplying patches.\e[39m' | ||
| echo | ||
|
|
||
| for patch_file in $patch_prefix/*.patch; do | ||
| apply_patch $patch_file -d $output_prefix | ||
| done |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -101,15 +101,6 @@ mkdir -p $prefix/libs | |
| export TARGET_DIR=$prefix/target | ||
| [ -d $TARGET_DIR ] || mkdir -p $TARGET_DIR | ||
|
|
||
| export RBA_TOOLCHAIN=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake | ||
| apply_patch $my_loc/patches/android.toolchain.cmake.patch -d $ANDROID_NDK_HOME/build/cmake | ||
|
|
||
|
|
@@ -123,166 +114,7 @@ echo | |
| if [[ $skip -ne 1 ]] ; then | ||
| run_cmd get_catkin_packages $prefix | ||
|
|
||
| run_cmd apply_patches $my_loc/patches/source_patches $prefix | ||
|
There was a problem hiding this comment. Why the additional subdirectory There was a problem hiding this comment. There's a single patch that has to be applied in a different directory: There was a problem hiding this comment. 👍 An alternative approach I took in https://github.com/Intermodalics/ros_android_private/pull/17 is to commit a wrapper Such a custom and, if necessary, generated toolchain file could also replace most of the cmake options passed in build_catkin_workspace.sh:103ff and utils.sh:21 and be exposed to the user to be used in overlay workspaces (installed to target). |
||
| fi | ||
|
|
||
| # Before build | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This special case is not handled anymore. In combination with do_everything.sh:120ff if
use_pluginlibis disabled in config.sh:12, applying the patches would breakpluginlib.The alternative would be to ignore package
pluginliband all its dependees when building withuse_pluginlib=0, because the unpatched version would not work anyway on Android if I am not mistaken.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AFAIU the unpatched version won't work; my rationale is that if you don't want
pluginlib, applying a few extra packages doesn't add too much overhead, and you won't be able to usepluginlibanyway.I agree that for correctness we should ignore
pluginliband deps, but on second thought I'd just drop the flag and build pluginlib support always, as it really doesn't add too much build time to the overall, and the flag just adds some more complexity to the scripts. WDYT?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Always building with pluginlib support enabled would be fine for me.