From d8d9ee3243829183e4e9324a790077eb6f443de2 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Fri, 15 Jan 2016 10:10:06 +0100 Subject: [PATCH 1/2] Problem: no support for OpenWRT Solution: copy ZeroMQ packaging script from https://github.com/vperron/openwrt-zmq-packages Note: this is not usable as-such, needs fixing. --- .gitignore | 6 +++- builds/openwrt/Makefile | 61 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 builds/openwrt/Makefile diff --git a/.gitignore b/.gitignore index d1047098..8cf102d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ syntax: glob # for hg-git users -Makefile +/Makefile +builds/Makefile +builds/msvc/Makefile +configure +doc/Makefile Makefile.in configure libtool diff --git a/builds/openwrt/Makefile b/builds/openwrt/Makefile new file mode 100644 index 00000000..434f9cbf --- /dev/null +++ b/builds/openwrt/Makefile @@ -0,0 +1,61 @@ +# Copyright (C) [2011-2012] [TheClashingRocks.org] +# +# Author: Jiva Nath Bagale +# author: Victor Perron +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=zeromq +PKG_VERSION:=3.2.2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://download.zeromq.org/ + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/zeromq + MAINTAINER:=victor@iso3103.net + TITLE:=zeromq + SECTION:=libs + DEPENDS:=+libstdcpp +libpthread +librt + CATEGORY:=Libraries + URL:=http://www.zeromq.org/ +endef + +define Package/zeromq/description + The library provides light weight messaging services using an intelligent transport layer. + It can carry messages across inproc, IPC, TCP and multicast and is faster than TCP for + clustered products and supercomputing. +endef + + +define Build/InstallDev + $(INSTALL_DIR) \ + $(1)/usr/lib \ + $(1)/usr/include \ + $(1)/usr/lib/pkgconfig + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/* \ + $(1)/usr/lib/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/include/* \ + $(1)/usr/include/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig \ + $(1)/usr/lib/ + +endef + +define Package/zeromq/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,zeromq)) + From 055995e5357787f0a999ceaa4a02238626b0d166 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Fri, 15 Jan 2016 10:25:38 +0100 Subject: [PATCH 2/2] Problem: builds directory contains packaging scripts Specifically, the RedHat tools. Solution: move this into packaging/ --- Makefile.am | 2 +- builds/README | 4 ++++ configure.ac | 2 +- packaging/README | 4 ++++ {builds => packaging}/redhat/zeromq.spec.in | 0 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 builds/README create mode 100644 packaging/README rename {builds => packaging}/redhat/zeromq.spec.in (100%) diff --git a/Makefile.am b/Makefile.am index ca152a38..e7515157 100644 --- a/Makefile.am +++ b/Makefile.am @@ -731,7 +731,7 @@ dist-hook: else \ echo A git clone is required to generate a ChangeLog >&2; \ fi - -cp $(top_srcdir)/builds/redhat/zeromq.spec $(distdir)/zeromq.spec + -cp $(top_srcdir)/packaging/redhat/zeromq.spec $(distdir)/zeromq.spec maintainer-clean-local: -rm -rf $(top_srcdir)/config diff --git a/builds/README b/builds/README new file mode 100644 index 00000000..1d2b8f34 --- /dev/null +++ b/builds/README @@ -0,0 +1,4 @@ +This directory holds build tools, i.e. tools we use to build the current +code tree. Packaging tools (which take released tarballs or github code +repos) should go into /packaging. + diff --git a/configure.ac b/configure.ac index ce3eae7b..7c8a9738 100644 --- a/configure.ac +++ b/configure.ac @@ -606,6 +606,6 @@ AC_CONFIG_FILES([ \ doc/Makefile \ builds/Makefile \ builds/msvc/Makefile \ - builds/redhat/zeromq.spec]) + packaging/redhat/zeromq.spec]) AC_OUTPUT diff --git a/packaging/README b/packaging/README new file mode 100644 index 00000000..c8350fe5 --- /dev/null +++ b/packaging/README @@ -0,0 +1,4 @@ +This directory is for packaging tools. Please do not hardcode version +numbers into your scripts; you can get them at runtime by calling +version.sh, or at configure time if you use autoconf. + diff --git a/builds/redhat/zeromq.spec.in b/packaging/redhat/zeromq.spec.in similarity index 100% rename from builds/redhat/zeromq.spec.in rename to packaging/redhat/zeromq.spec.in