From 7c21621849333427e4ed09b10299358771bdafeb Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 9 Jul 2020 15:19:34 -0700 Subject: [PATCH] czmq: switch to CMake Allows faster compilation and removing various Makefile hacks. Fixed license to SPDX format. Added PKG_BUILD_PARALLEL for faster compilation. Various cleanups for consistency between packages. Signed-off-by: Rosen Penev --- libs/czmq/Makefile | 47 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/libs/czmq/Makefile b/libs/czmq/Makefile index 8442c5ced..3cb5b7121 100644 --- a/libs/czmq/Makefile +++ b/libs/czmq/Makefile @@ -9,31 +9,29 @@ include $(TOPDIR)/rules.mk PKG_NAME:=czmq PKG_VERSION:=4.2.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/zeromq/czmq/releases/download/v$(PKG_VERSION)/ PKG_HASH:=cfab29c2b3cc8a845749758a51e1dd5f5160c1ef57e2a41ea96e4c2dcc8feceb -PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf - -PKG_LICENSE:=MPLv2 -PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Jan Pavlinec +PKG_LICENSE:=MPL-2.0 +PKG_LICENSE_FILES:=LICENSE -PKG_ABI_VERSION:=4 +CMAKE_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/autotools.mk +include $(INCLUDE_DIR)/cmake.mk define Package/czmq - SECTION:=libs - CATEGORY:=Libraries - TITLE:=CZMQ High-level C binding for ZeroMQ - URL:=http://czmq.zeromq.org - ABI_VERSION:=$(PKG_ABI_VERSION) - DEPENDS:=+libzmq +libuuid +libpcre +libmicrohttpd +liblz4 +libcurl + SECTION:=libs + CATEGORY:=Libraries + TITLE:=CZMQ High-level C binding for ZeroMQ + URL:=http://czmq.zeromq.org + ABI_VERSION:=4 + DEPENDS:=+libzmq +libuuid +libpcre +libmicrohttpd +liblz4 +libcurl endef define Package/czmq/description @@ -41,24 +39,17 @@ define Package/czmq/description library, aimed at use in distributed or concurrent applications. endef -TARGET_CFLAGS += --std=c99 -CONFIGURE_ARGS += --without-docs - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ -endef +CMAKE_OPTIONS += \ + -DBUILD_TESTING=OFF \ + -DCMAKECONFIG_INSTALL_DIR=lib/cmake/czmq \ + -DCMAKE_SKIP_INSTALL_RPATH=ON \ + -DENABLE_DRAFTS=OFF define Package/czmq/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/zmakecert $(1)/usr/bin/zmakecert + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/zmakecert $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libczmq.so.$(PKG_VERSION) $(1)/usr/lib/ - $(LN) /usr/lib/libczmq.so.$(PKG_VERSION) $(1)/usr/lib/libczmq.so - $(LN) /usr/lib/libczmq.so.$(PKG_VERSION) $(1)/usr/lib/libczmq.so.$(PKG_ABI_VERSION) + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libczmq.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,czmq))