openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-22 01:44:32 +04:00
Code Issues Packages Projects Releases Wiki Activity

zmq: fix compilation when libbsd is present

Browse Source 
Limit libbsd support to glibc.

Remove wrong python variable.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit bb9dd1468d)
This commit is contained in:
Rosen Penev
2020-09-16 00:16:07 -07:00
parent 8bb1d13a97
commit 03425a0d2f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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