mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
libzmq: Remove uClibc++ support
libzmq is used by fbzmq, which absolutely requires libstdcpp since it's a
C++14 project. There's no point in using two libc++.
Cleaned up Makefile for consistency between packages.
Added nanosleep patch for platforms that are missing usleep.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from ad11587c40)
This commit is contained in:
+15
-13
@@ -1,4 +1,4 @@
|
||||
#
|
||||
#
|
||||
# Copyright (C) 2016 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
@@ -11,25 +11,22 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=zeromq
|
||||
PKG_VERSION:=4.1.7
|
||||
PKG_RELEASE:=1
|
||||
PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
|
||||
PKG_LICENSE:=GPL-3.0+
|
||||
PKG_LICENSE_FILES:=LICENCE.txt
|
||||
|
||||
PKG_CPE_ID:=cpe:/a:zeromq:libzmq
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/zeromq/zeromq4-1/releases/download/v$(PKG_VERSION)
|
||||
PKG_HASH:=31c383cfcd3be1dc8a66e448c403029e793687e70473b89c4cc0bd626e7da299
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
|
||||
|
||||
PKG_FIXUP:=autoreconf
|
||||
PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
|
||||
PKG_LICENSE:=GPL-3.0-or-later
|
||||
PKG_LICENSE_FILES:=LICENCE.txt
|
||||
PKG_CPE_ID:=cpe:/a:zeromq:libzmq
|
||||
|
||||
PKG_INSTALL:=1
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PKG_REMOVE_FILES:=autogen.sh acinclude.m4 aclocal.m4
|
||||
|
||||
|
||||
include $(INCLUDE_DIR)/uclibc++.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/libzmq/default
|
||||
@@ -37,7 +34,7 @@ define Package/libzmq/default
|
||||
URL:=http://www.zeromq.org/
|
||||
SECTION:=libs
|
||||
CATEGORY:=Libraries
|
||||
DEPENDS:=+libuuid +libpthread +librt $(CXX_DEPENDS)
|
||||
DEPENDS:=+libuuid +libpthread +librt +libstdcpp
|
||||
PROVIDES:=libzmq
|
||||
endef
|
||||
|
||||
@@ -65,7 +62,10 @@ endef
|
||||
# add extra configure flags here
|
||||
CONFIGURE_ARGS += \
|
||||
--enable-static \
|
||||
--enable-shared
|
||||
--enable-shared \
|
||||
--with-pic \
|
||||
--with-relaxed \
|
||||
--without-documentation
|
||||
|
||||
ifeq ($(BUILD_VARIANT),curve)
|
||||
CONFIGURE_ARGS+= --with-libsodium
|
||||
@@ -73,6 +73,8 @@ else
|
||||
CONFIGURE_ARGS+= --without-libsodium
|
||||
endif
|
||||
|
||||
TARGET_CXXFLAGS += -Wno-error=cpp
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(1)/usr/include
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/zmq.h $(1)/usr/include
|
||||
|
||||
Reference in New Issue
Block a user