1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00

update VILLASfpga submodule

This commit is contained in:
Steffen Vogel 2021-09-16 12:31:18 +02:00
parent 6e8da64e79
commit 186357db43
3 changed files with 5 additions and 4 deletions

2
fpga

@ -1 +1 @@
Subproject commit 3b31cb02fc57debd679edd1679a7994d492727fa
Subproject commit f1b5554752353ee044e6139f20ba92bfeaf12c70

View file

@ -78,7 +78,7 @@ fi
# Build & Install mosquitto
if ! pkg-config "libmosquitto >= 1.4.15" && \
[ -z "${SKIP_LIBIEC61850}" ]; then
[ -z "${SKIP_LIBMOSQUITTO}" ]; then
git clone --branch v2.0.12 --depth 1 https://github.com/eclipse/mosquitto
mkdir -p mosquitto/build
pushd mosquitto/build
@ -93,7 +93,7 @@ fi
# Build & Install rabbitmq-c
if ! pkg-config "librabbitmq >= 0.8.0" && \
[ -z "${SKIP_LIBIEC61850}" ]; then
[ -z "${SKIP_LIBRABBITMQ}" ]; then
git clone --branch v0.11.0 --depth 1 https://github.com/alanxz/rabbitmq-c
mkdir -p rabbitmq-c/build
pushd rabbitmq-c/build
@ -104,7 +104,7 @@ fi
# Build & Install libzmq
if ! pkg-config "libzmq >= 2.2.0" && \
[ -z "${SKIP_LIBIEC61850}" ]; then
[ -z "${SKIP_LIBZMQ}" ]; then
git clone --branch v4.3.4 --depth 1 https://github.com/zeromq/libzmq
mkdir -p libzmq/build
pushd libzmq/build

View file

@ -70,6 +70,7 @@ RUN apt-get update && \
libre-dev:${ARCH} \
liblua5.3-dev:${ARCH} \
libhiredis-dev:${ARCH}
# Add local and 64-bit locations to linker paths
ENV echo /usr/local/lib >> /etc/ld.so.conf && \
echo /usr/local/lib64 >> /etc/ld.so.conf