Browse Source

Merge pull request #13406 from neheb/zmqqq

zmq: fix compilation when libbsd is present
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
67bd65aead
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      libs/zmq/Makefile

+ 4
- 4
libs/zmq/Makefile View File

@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zeromq PKG_NAME:=zeromq
PKG_VERSION:=4.3.3 PKG_VERSION:=4.3.3
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/zeromq/libzmq/releases/download/v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/zeromq/libzmq/releases/download/v$(PKG_VERSION)
@ -33,7 +33,7 @@ define Package/libzmq/default
URL:=http://www.zeromq.org/ URL:=http://www.zeromq.org/
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+libuuid +libpthread +librt +libstdcpp
DEPENDS:=+libuuid +libpthread +librt +libstdcpp +USE_GLIBC:libbsd
PROVIDES:=libzmq PROVIDES:=libzmq
endef endef
@ -72,10 +72,10 @@ CMAKE_OPTIONS += \
-DENABLE_CURVE=ON \ -DENABLE_CURVE=ON \
-DENABLE_EVENTFD=ON \ -DENABLE_EVENTFD=ON \
-DPOLLER=epoll \ -DPOLLER=epoll \
-DPYTHON_EXECUTABLE=OFF \
-DRT_LIBRARY=OFF \ -DRT_LIBRARY=OFF \
-DWITH_OPENPGM=OFF \ -DWITH_OPENPGM=OFF \
-DZMQ_BUILD_TESTS=OFF
-DZMQ_BUILD_TESTS=OFF \
-DWITH_LIBBSD=O$(if $(CONFIG_USE_GLIBC),N,FF)
ifeq ($(BUILD_VARIANT),curve) ifeq ($(BUILD_VARIANT),curve)
CMAKE_OPTIONS += -DWITH_LIBSODIUM=ON CMAKE_OPTIONS += -DWITH_LIBSODIUM=ON


Loading…
Cancel
Save