mirror of
https://github.com/introlab/rtabmap.git
synced 2026-10-04 17:17:47 +08:00
arm64 ldconfig order
This commit is contained in:
@@ -165,6 +165,10 @@ RUN git clone --branch 4.2.0 https://github.com/opencv/opencv.git && \
|
|||||||
cd ../.. && \
|
cd ../.. && \
|
||||||
rm -rf opencv opencv_contrib
|
rm -rf opencv opencv_contrib
|
||||||
|
|
||||||
|
# ld.so.conf.d is read in filename order: <arch>-linux-gnu.conf sorts before
|
||||||
|
# libc.conf (/usr/local/lib) on arm64, so source builds lose to the distro ones.
|
||||||
|
RUN echo /usr/local/lib > /etc/ld.so.conf.d/00-usr-local.conf && ldconfig
|
||||||
|
|
||||||
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
||||||
|
|
||||||
COPY ./docker/focal-foxy/deps/ros_entrypoint.sh /ros_entrypoint.sh
|
COPY ./docker/focal-foxy/deps/ros_entrypoint.sh /ros_entrypoint.sh
|
||||||
|
|||||||
@@ -190,6 +190,10 @@ RUN git clone https://github.com/laurentkneip/opengv.git && \
|
|||||||
cd && \
|
cd && \
|
||||||
rm -r opengv
|
rm -r opengv
|
||||||
|
|
||||||
|
# ld.so.conf.d is read in filename order: <arch>-linux-gnu.conf sorts before
|
||||||
|
# libc.conf (/usr/local/lib) on arm64, so source builds lose to the distro ones.
|
||||||
|
RUN echo /usr/local/lib > /etc/ld.so.conf.d/00-usr-local.conf && ldconfig
|
||||||
|
|
||||||
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
||||||
|
|
||||||
# for jetson (https://github.com/introlab/rtabmap/issues/776)
|
# for jetson (https://github.com/introlab/rtabmap/issues/776)
|
||||||
|
|||||||
@@ -74,6 +74,10 @@ RUN git clone --branch 4.5.4 https://github.com/opencv/opencv.git && \
|
|||||||
cd ../.. && \
|
cd ../.. && \
|
||||||
rm -rf opencv opencv_contrib
|
rm -rf opencv opencv_contrib
|
||||||
|
|
||||||
|
# ld.so.conf.d is read in filename order: <arch>-linux-gnu.conf sorts before
|
||||||
|
# libc.conf (/usr/local/lib) on arm64, so source builds lose to the distro ones.
|
||||||
|
RUN echo /usr/local/lib > /etc/ld.so.conf.d/00-usr-local.conf && ldconfig
|
||||||
|
|
||||||
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
||||||
|
|
||||||
COPY ./docker/jammy-iron/deps/ros_entrypoint.sh /ros_entrypoint.sh
|
COPY ./docker/jammy-iron/deps/ros_entrypoint.sh /ros_entrypoint.sh
|
||||||
|
|||||||
@@ -98,6 +98,10 @@ RUN git clone https://github.com/laurentkneip/opengv.git && \
|
|||||||
cd && \
|
cd && \
|
||||||
rm -r opengv
|
rm -r opengv
|
||||||
|
|
||||||
|
# ld.so.conf.d is read in filename order: <arch>-linux-gnu.conf sorts before
|
||||||
|
# libc.conf (/usr/local/lib) on arm64, so source builds lose to the distro ones.
|
||||||
|
RUN echo /usr/local/lib > /etc/ld.so.conf.d/00-usr-local.conf && ldconfig
|
||||||
|
|
||||||
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
||||||
|
|
||||||
RUN echo -e '#!/bin/bash\nset -e\n\n# setup ros2 environment\nsource "/opt/ros/humble/setup.bash" --\nexec "$@"' > /ros_entrypoint.sh
|
RUN echo -e '#!/bin/bash\nset -e\n\n# setup ros2 environment\nsource "/opt/ros/humble/setup.bash" --\nexec "$@"' > /ros_entrypoint.sh
|
||||||
|
|||||||
@@ -118,6 +118,10 @@ RUN git clone https://github.com/laurentkneip/opengv.git && \
|
|||||||
cd && \
|
cd && \
|
||||||
rm -r opengv
|
rm -r opengv
|
||||||
|
|
||||||
|
# ld.so.conf.d is read in filename order: <arch>-linux-gnu.conf sorts before
|
||||||
|
# libc.conf (/usr/local/lib) on arm64, so source builds lose to the distro ones.
|
||||||
|
RUN echo /usr/local/lib > /etc/ld.so.conf.d/00-usr-local.conf && ldconfig
|
||||||
|
|
||||||
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
||||||
|
|
||||||
RUN echo -e '#!/bin/bash\nset -e\n\n# setup ros2 environment\nsource "/opt/ros/kilted/setup.bash" --\nexec "$@"' > /ros_entrypoint.sh
|
RUN echo -e '#!/bin/bash\nset -e\n\n# setup ros2 environment\nsource "/opt/ros/kilted/setup.bash" --\nexec "$@"' > /ros_entrypoint.sh
|
||||||
|
|||||||
@@ -117,6 +117,10 @@ RUN git clone https://github.com/laurentkneip/opengv.git && \
|
|||||||
cd && \
|
cd && \
|
||||||
rm -r opengv
|
rm -r opengv
|
||||||
|
|
||||||
|
# ld.so.conf.d is read in filename order: <arch>-linux-gnu.conf sorts before
|
||||||
|
# libc.conf (/usr/local/lib) on arm64, so source builds lose to the distro ones.
|
||||||
|
RUN echo /usr/local/lib > /etc/ld.so.conf.d/00-usr-local.conf && ldconfig
|
||||||
|
|
||||||
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
||||||
|
|
||||||
RUN echo -e '#!/bin/bash\nset -e\n\n# setup ros2 environment\nsource "/opt/ros/jazzy/setup.bash" --\nexec "$@"' > /ros_entrypoint.sh
|
RUN echo -e '#!/bin/bash\nset -e\n\n# setup ros2 environment\nsource "/opt/ros/jazzy/setup.bash" --\nexec "$@"' > /ros_entrypoint.sh
|
||||||
|
|||||||
@@ -107,6 +107,10 @@ RUN git clone https://github.com/laurentkneip/opengv.git && \
|
|||||||
cd && \
|
cd && \
|
||||||
rm -r opengv
|
rm -r opengv
|
||||||
|
|
||||||
|
# ld.so.conf.d is read in filename order: <arch>-linux-gnu.conf sorts before
|
||||||
|
# libc.conf (/usr/local/lib) on arm64, so source builds lose to the distro ones.
|
||||||
|
RUN echo /usr/local/lib > /etc/ld.so.conf.d/00-usr-local.conf && ldconfig
|
||||||
|
|
||||||
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
||||||
|
|
||||||
RUN echo -e '#!/bin/bash\nset -e\n\n# setup ros2 environment\nsource "/opt/ros/lyrical/setup.bash" --\nexec "$@"' > /ros_entrypoint.sh
|
RUN echo -e '#!/bin/bash\nset -e\n\n# setup ros2 environment\nsource "/opt/ros/lyrical/setup.bash" --\nexec "$@"' > /ros_entrypoint.sh
|
||||||
|
|||||||
Reference in New Issue
Block a user