Merge pull request #12871 from neheb/zmqq

zmq: switch to building with CMake
This commit is contained in:
Rosen Penev 2020-07-18 23:31:21 -07:00 committed by GitHub
commit 91fbdab361
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 15 deletions

View file

@ -22,11 +22,11 @@ PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=LICENCE.txt PKG_LICENSE_FILES:=LICENCE.txt
PKG_CPE_ID:=cpe:/a:zeromq:libzmq PKG_CPE_ID:=cpe:/a:zeromq:libzmq
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_REMOVE_FILES:=autogen.sh acinclude.m4 aclocal.m4 CMAKE_BINARY_SUBDIR:=openwrt-build
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/libzmq/default define Package/libzmq/default
TITLE:=ZeroMQ - Message Queue engine TITLE:=ZeroMQ - Message Queue engine
@ -58,35 +58,43 @@ define Package/libzmq-curve/description
Includes CurveZMQ security by libsodium. Includes CurveZMQ security by libsodium.
endef endef
# add extra configure flags here CMAKE_OPTIONS += \
CONFIGURE_ARGS += \ -DA2X_EXECUTABLE=OFF \
--enable-static \ -DASCIIDOC_EXECUTABLE=OFF \
--enable-shared \ -DCMAKE_SKIP_INSTALL_RPATH=ON \
--with-pic \ -DZMQ_HAVE_SOCK_CLOEXEC=ON \
--with-relaxed \ -DZMQ_HAVE_SO_KEEPALIVE=ON \
--without-documentation -DZMQ_HAVE_TCP_KEEPCNT=ON \
-DZMQ_HAVE_TCP_KEEPIDLE=ON \
-DZMQ_HAVE_TCP_KEEPINTVL=ON \
-DZMQ_HAVE_TCP_KEEPALIVE=ON \
-DENABLE_CURVE=ON \
-DENABLE_EVENTFD=ON \
-DPOLLER=epoll \
-DPYTHON_EXECUTABLE=OFF \
-DRT_LIBRARY=OFF \
-DWITH_OPENPGM=OFF \
-DZMQ_BUILD_TESTS=OFF
ifeq ($(BUILD_VARIANT),curve) ifeq ($(BUILD_VARIANT),curve)
CONFIGURE_ARGS+= --with-libsodium CMAKE_OPTIONS += -DWITH_LIBSODIUM=ON
else else
CONFIGURE_ARGS+= --without-libsodium CMAKE_OPTIONS += -DWITH_LIBSODIUM=OFF
endif endif
TARGET_CXXFLAGS += -Wno-error=cpp
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/zmq.h $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/zmq.h $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/zmq_utils.h $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/zmq_utils.h $(1)/usr/include
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libzmq.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libzmq.so* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libzmq.pc $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libzmq.pc $(1)/usr/lib/pkgconfig/
endef endef
define Package/libzmq-nc/install define Package/libzmq-nc/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libzmq.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libzmq.so $(1)/usr/lib/
endef endef
Package/libzmq-curve/install=$(Package/libzmq-nc/install) Package/libzmq-curve/install=$(Package/libzmq-nc/install)

View file

@ -0,0 +1,20 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,8 @@
cmake_minimum_required(VERSION 2.8.11)
project(ZeroMQ)
+include(FindPkgConfig)
+
option(WITH_OPENPGM "Build with support for OpenPGM" OFF)
if(APPLE)
@@ -21,7 +23,7 @@ if (NOT ENABLE_CURVE)
message (STATUS "CURVE security is disabled")
elseif (WITH_LIBSODIUM)
- find_package (Sodium)
+ pkg_search_module (SODIUM REQUIRED libsodium)
if (SODIUM_FOUND)
message (STATUS "Using libsodium for CURVE security")
include_directories (${SODIUM_INCLUDE_DIRS})