zmq: add optional dependency on openpgm

And add a patch for CMakeList.txt to configure
correctly with openpgm enabled.

Signed-off-by: Ye Holmes <yeholmes@outlook.com>

libs/zmq/Makefile

@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zeromq
 PKG_VERSION:=4.3.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/zeromq/libzmq/releases/download/v$(PKG_VERSION)
@@ -37,16 +37,24 @@ define Package/libzmq/default
   PROVIDES:=libzmq
 endef
 
+define Package/libzmq/default-config
+config LIBZMQ_$(2)_WITH_OPENPGM
+	depends on PACKAGE_libzmq-$(1)
+	bool "enable openpgm support for libzmq-$(1)"
+	default n
+endef
+
 define Package/libzmq-nc
   $(call Package/libzmq/default)
   VARIANT:=nc
+  DEPENDS+=+LIBZMQ_NC_WITH_OPENPGM:openpgm
 endef
 
 define Package/libzmq-curve
   $(call Package/libzmq/default)
   VARIANT:=curve
   TITLE+= (CurveZMQ)
-  DEPENDS+=+libsodium
+  DEPENDS+=+libsodium +LIBZMQ_CURVE_WITH_OPENPGM:openpgm
 endef
 
 define Package/libzmq-nc/description
@@ -58,6 +66,14 @@ define Package/libzmq-curve/description
  Includes CurveZMQ security by libsodium.
 endef
 
+define Package/libzmq-nc/config
+	$(call Package/libzmq/default-config,nc,NC)
+endef
+
+define Package/libzmq-curve/config
+	$(call Package/libzmq/default-config,curve,CURVE)
+endef
+
 CMAKE_OPTIONS += \
 	-DA2X_EXECUTABLE=OFF \
 	-DASCIIDOC_EXECUTABLE=OFF \
@@ -73,7 +89,6 @@ CMAKE_OPTIONS += \
 	-DENABLE_EVENTFD=ON \
 	-DPOLLER=epoll \
 	-DRT_LIBRARY=OFF \
-	-DWITH_OPENPGM=OFF \
 	-DZMQ_BUILD_TESTS=OFF \
 	-DWITH_LIBBSD=O$(if $(CONFIG_USE_GLIBC),N,FF)
 
@@ -83,6 +98,14 @@ else
   	CMAKE_OPTIONS += -DWITH_LIBSODIUM=OFF
 endif
 
+ifeq ($(CONFIG_LIBZMQ_NC_WITH_OPENPGM),y)
+	CMAKE_OPTIONS += -DWITH_OPENPGM=ON
+else ifeq ($(CONFIG_LIBZMQ_CURVE_WITH_OPENPGM),y)
+	CMAKE_OPTIONS += -DWITH_OPENPGM=ON
+else
+	CMAKE_OPTIONS += -DWITH_OPENPGM=OFF
+endif
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/zmq.h $(1)/usr/include