Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-30 00:00:11 +01:00
Code Issues Releases Wiki Activity

zeromq: add libzmq as thirdparty module

Browse source
This commit is contained in:
Steffen Vogel 2017-05-22 20:06:31 +02:00
parent ba3aec3d0e
commit 4316ecaf38
5 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.dockerignore
View file

@ -4,3 +4,4 @@
!thirdparty/criterion/ !thirdparty/criterion/
!thirdparty/libwebsockets/ !thirdparty/libwebsockets/
!thirdparty/nanomsg/ !thirdparty/nanomsg/
!thirdparty/libzmq/

3
.gitmodules vendored
View file

@ -28,3 +28,6 @@
[submodule "thirdparty/nanomsg"] [submodule "thirdparty/nanomsg"]
path = thirdparty/nanomsg path = thirdparty/nanomsg
url = https://github.com/nanomsg/nanomsg.git url = https://github.com/nanomsg/nanomsg.git
[submodule "thirdparty/libzmq"]
path = thirdparty/libzmq
url = https://github.com/zeromq/libzmq.git

8
Dockerfile.dev
View file

@ -45,7 +45,9 @@ RUN dnf -y install \
libconfig-devel \ libconfig-devel \
libnl3-devel \ libnl3-devel \
libcurl-devel \ libcurl-devel \
jansson-devel jansson-devel \
libsodium-devel \
openpgm-devel
# Several tools only needed for developement and testing # Several tools only needed for developement and testing
RUN dnf -y install \ RUN dnf -y install \
@ -85,6 +87,10 @@ RUN mkdir -p /tmp/libwebsockets/build && cd /tmp/libwebsockets/build && cmake -D
COPY thirdparty/nanomsg /tmp/nanomsg COPY thirdparty/nanomsg /tmp/nanomsg
RUN mkdir -p /tmp/nanomsg/build && cd /tmp/nanomsg/build && cmake .. && make install RUN mkdir -p /tmp/nanomsg/build && cd /tmp/nanomsg/build && cmake .. && make install
# Build & Install libzmq
COPY thirdparty/libzmq /tmp/libzmq
RUN cd /tmp/libzmq && autoreconf -fi && ./configure --with-libsodium --with-pgm --enable-drafts && make install
# Cleanup intermediate files from builds # Cleanup intermediate files from builds
RUN rm -rf /tmp/* RUN rm -rf /tmp/*

7
thirdparty/Makefile.inc vendored
View file

@ -21,7 +21,7 @@
################################################################################### ###################################################################################
DEPS_CMAKE = libxil libwebsockets criterion jansson nanomsg DEPS_CMAKE = libxil libwebsockets criterion jansson nanomsg
DEPS_AUTOCONF = libnl libconfig libcurl DEPS_AUTOCONF = libnl libconfig libcurl libzmq
DEPS = $(DEPS_CMAKE) $(DEPS_AUTOCONF) DEPS = $(DEPS_CMAKE) $(DEPS_AUTOCONF)
@ -33,13 +33,15 @@ ifdef DEBUG
AC_CXXFLAGS=-g -O0 AC_CXXFLAGS=-g -O0
endif endif
CONFIGURE_OPTS = --prefix=$(PREFIX)
thirdparty: thirdparty:
# Install & compile autotools based projects # Install & compile autotools based projects
$(DEPS_AUTOCONF): CPPFLAGS=$(AC_CPPFLAGS) CFLAGS=$(AC_CFLAGS) CXXFLAGS=$(AC_CXXFLAGS) $(DEPS_AUTOCONF): CPPFLAGS=$(AC_CPPFLAGS) CFLAGS=$(AC_CFLAGS) CXXFLAGS=$(AC_CXXFLAGS)
$(DEPS_AUTOCONF): | $(BUILDDIR)/thirdparty/$$@/ $(DEPS_AUTOCONF): | $(BUILDDIR)/thirdparty/$$@/
autoreconf -fi $(SRCDIR)/thirdparty/$@ autoreconf -fi $(SRCDIR)/thirdparty/$@
cd $(BUILDDIR)/thirdparty/$@ && $(SRCDIR)/thirdparty/$@/configure --prefix=$(PREFIX) && make cd $(BUILDDIR)/thirdparty/$@ && $(SRCDIR)/thirdparty/$@/configure $(CONFIGURE_OPTS) && make
# Install & compile CMake based projects # Install & compile CMake based projects
$(DEPS_CMAKE): | $(BUILDDIR)/thirdparty/$$@/ $(DEPS_CMAKE): | $(BUILDDIR)/thirdparty/$$@/
@ -68,5 +70,6 @@ libconfig-fix:
rm -f $(SRCDIR)/thirdparty/libconfig/lib/scanner.[hc] rm -f $(SRCDIR)/thirdparty/libconfig/lib/scanner.[hc]
libwebsockets: CMAKE_OPTS += -DLWS_IPV6=1 -DLWS_WITH_STATIC=0 -DLWS_WITHOUT_TESTAPPS=1 -DLWS_WITH_HTTP2=1 libwebsockets: CMAKE_OPTS += -DLWS_IPV6=1 -DLWS_WITH_STATIC=0 -DLWS_WITHOUT_TESTAPPS=1 -DLWS_WITH_HTTP2=1
libzmq: CONFIGURE_OPTS += --with-libsodium --with-pgm --enable-drafts
.PHONY: $(DEPS) thirdparty clean-thirdparty install-thirdparty .PHONY: $(DEPS) thirdparty clean-thirdparty install-thirdparty

1
thirdparty/libzmq vendored Submodule

@ -0,0 +1 @@
Subproject commit ec56eaaeb666960548375cc3746ac0b6927977e4