Skip to content

Commit 2222bd4

Browse files
Try fixing cross-python issues
1 parent 896d2f3 commit 2222bd4

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

vinca/templates/build_catkin.sh.in

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,22 @@ export LINK=$CXX
1919

2020
if [[ "$CONDA_BUILD_CROSS_COMPILATION" != "1" ]]; then
2121
PYTHON_EXECUTABLE=$PREFIX/bin/python
22-
else
23-
PYTHON_EXECUTABLE=$BUILD_PREFIX/bin/python
24-
fi
25-
echo "USING PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}"
26-
27-
28-
if [[ "$CONDA_BUILD_CROSS_COMPILATION" != "1" ]]; then
2922
PKG_CONFIG_EXECUTABLE=$PREFIX/bin/pkg-config
3023
else
24+
PYTHON_EXECUTABLE=$BUILD_PREFIX/bin/python
3125
PKG_CONFIG_EXECUTABLE=$BUILD_PREFIX/bin/pkg-config
3226
fi
27+
echo "USING PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}"
3328
echo "USING PKG_CONFIG_EXECUTABLE=${PKG_CONFIG_EXECUTABLE}"
3429

35-
3630
export ROS_PYTHON_VERSION=`$PYTHON_EXECUTABLE -c "import sys; print('%i.%i' % (sys.version_info[0:2]))"`
3731
echo "Using Python $ROS_PYTHON_VERSION"
3832

33+
# see https://github.com/conda-forge/cross-python-feedstock/issues/24
34+
if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then
35+
find $PREFIX/lib/cmake -type f -exec sed -i "s~\${_IMPORT_PREFIX}/lib/python$ROS_PYTHON_VERSION/site-packages~$BUILD_PREFIX/lib/python$ROS_PYTHON_VERSION/site-packages~g" {} +
36+
fi
37+
3938
# NOTE: there might be undefined references occurring
4039
# in the Boost.system library, depending on the C++ versions
4140
# used to compile Boost. We can avoid them by forcing the use of

0 commit comments

Comments
 (0)