mirror of
https://git.rwth-aachen.de/acs/public/villas/node/
synced 2025-03-09 00:00:00 +01:00
fix annot find -lre
Signed-off-by: Alexandra <alexandra.bach@eonerc.rwth-aachen.de>
This commit is contained in:
parent
b154b029f0
commit
a0d905f445
2 changed files with 15 additions and 17 deletions
|
@ -295,21 +295,21 @@ if ! pkg-config "comedilib >= 0.11.0" && \
|
|||
fi
|
||||
|
||||
# Build & Install libre
|
||||
# if ! pkg-config "libre >= 3.6.0" && \
|
||||
# should_build "libre" "for the rtp node-type"; then
|
||||
# git clone ${GIT_OPTS} --branch v3.6.0 https://github.com/baresip/re.git
|
||||
# mkdir -p re/build
|
||||
# pushd re/build
|
||||
# cmake -DUSE_LIBREM=OFF \
|
||||
# -DUSE_BFCP=OFF \
|
||||
# -DUSE_PCP=OFF \
|
||||
# -DUSE_RTMP=OFF \
|
||||
# -DUSE_SIP=OFF \
|
||||
# -DLIBRE_BUILD_STATIC=OFF \
|
||||
# ${CMAKE_OPTS} ..
|
||||
# make ${MAKE_OPTS} install
|
||||
# popd
|
||||
# fi
|
||||
if ! pkg-config "libre >= 3.6.0" && \
|
||||
should_build "libre" "for the rtp node-type"; then
|
||||
git clone ${GIT_OPTS} --branch v3.6.0 https://github.com/baresip/re.git
|
||||
mkdir -p re/build
|
||||
pushd re/build
|
||||
cmake -DUSE_LIBREM=OFF \
|
||||
-DUSE_BFCP=OFF \
|
||||
-DUSE_PCP=OFF \
|
||||
-DUSE_RTMP=OFF \
|
||||
-DUSE_SIP=OFF \
|
||||
-DLIBRE_BUILD_STATIC=OFF \
|
||||
${CMAKE_OPTS} ..
|
||||
make ${MAKE_OPTS} install
|
||||
popd
|
||||
fi
|
||||
|
||||
# Build & Install nanomsg
|
||||
if ! pkg-config "nanomsg >= 1.0.0" && \
|
||||
|
|
|
@ -77,8 +77,6 @@ ENV CMAKE_EXTRA_OPTS="-DCMAKE_TOOLCHAIN_FILE=/debian-${ARCH}.cmake \
|
|||
|
||||
ENV CONFIGURE_OPTS="--libdir=${PREFIX}/lib/${TRIPLET}"
|
||||
|
||||
ENV LD_LIBRARY_PATH=/usr/local/lib
|
||||
|
||||
RUN mkdir -p /usr/local/lib/${TRIPLET}
|
||||
|
||||
ENV CPP=${TRIPLET}-cpp
|
||||
|
|
Loading…
Add table
Reference in a new issue