Skip to contentSkip to conversation

qpid-proton: new package

PATCH New Luca Ceresoli 2 participants 3 messages Jul 10, 2015 – Jul 11, 2015

lore
Share & tools
lore

Luca Ceresoli

author
#0 lore raw

PATCH 1/1 qpid-proton: new package

Signed-off-by Luca Ceresoli <[email protected]>

---

Patch from upstream.

Note: the tarball is buggy, as is contains two leading components instead of one, the first being a dummy ".":

  $ tar taf ~/src/qpid-proton-0.9.1.tar.gz
  ./
  ./qpid-proton-0.9.1-rc1/
  ./qpid-proton-0.9.1-rc1/version.txt
  [...]

So the tarball gets correctly extracted by hand, but the --strip-components=1 option we pass to tar is useless. This issue is handled fine by QPID_PROTON_SUBDIR, but the original patch does not apply. Thus I manually added the "qpid-proton-0.9.1-rc1/" prefix on the patch, which looked to me better than overriding QPID_PROTON_EXTRACT_CMDS or otherwise playing dirty with hooks.

---
 package/Config.in                                  |  1 +
 ...fix-C-compiler-detection-with-_ARG1-_ARG2.patch | 52 ++++++++++++++++++++++
 package/qpid-proton/Config.in                      | 17 +++++++
 package/qpid-proton/qpid-proton.hash               |  2 +
 package/qpid-proton/qpid-proton.mk                 | 28 ++++++++++++
 5 files changed, 100 insertions(+)
 create mode 100644 package/qpid-proton/0001-proton-c-fix-C-compiler-detection-with-_ARG1-_ARG2.patch
 create mode 100644 package/qpid-proton/Config.in
 create mode 100644 package/qpid-proton/qpid-proton.hash
 create mode 100644 package/qpid-proton/qpid-proton.mk
package/Config.in +1 -0
index d9b0794..21ead51 100644
@@ -995,6 +995,7 @@ menu "Networking"
 	source "package/openpgm/Config.in"
 	source "package/ortp/Config.in"
 	source "package/qdecoder/Config.in"
+	source "package/qpid-proton/Config.in"
 	source "package/rtmpdump/Config.in"
 	source "package/slirp/Config.in"
 	source "package/snmppp/Config.in"
package/qpid-proton/0001-proton-c-fix-C-compiler-detection-with-_ARG1-_ARG2.patch new file +52 -0

52 lines not on this page · raw message

package/qpid-proton/Config.in new file +17 -0
new file mode 100644
index 0000000..b6a1aa9
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_QPID_PROTON
+	bool "qpid-proton"
+	depends on BR2_USE_WCHAR # util-linux
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	help
+	  The AMQP messaging toolkit
+
+	  Qpid Proton is a high-performance, lightweight messaging library.
+	  It can be used in the widest range of messaging applications,
+	  including brokers, client libraries, routers, bridges, proxies, and
+	  more.
+
+	  https://qpid.apache.org/proton/
+
+comment "qpid-proton needs a toolchain w/ wchar"
+	depends on !BR2_USE_WCHAR
package/qpid-proton/qpid-proton.hash new file +2 -0
new file mode 100644
index 0000000..8c2cc4f
@@ -0,0 +1,2 @@
+# Hash from: http://www.apache.org/dist/qpid/proton/0.9.1/qpid-proton-0.9.1.tar.gz.sha
+sha1  98008d90acd0d47cbd7ac1572a2bb50b452338ed  qpid-proton-0.9.1.tar.gz
package/qpid-proton/qpid-proton.mk new file +28 -0
new file mode 100644
index 0000000..37ec052
@@ -0,0 +1,28 @@
+################################################################################
+#
+# qpid-proton
+#
+################################################################################
+
+QPID_PROTON_VERSION_MAJOR = 0.9
+QPID_PROTON_VERSION = $(QPID_PROTON_VERSION_MAJOR).1
+QPID_PROTON_SITE = http://apache.panu.it/qpid/proton/0.9.1
+QPID_PROTON_SUBDIR = qpid-proton-0.9.1-rc1
+QPID_PROTON_LICENSE = Apache-2.0
+QPID_PROTON_LICENSE_FILES = LICENSE
+QPID_PROTON_INSTALL_STAGING = YES
+QPID_PROTON_DEPENDENCIES = \
+	util-linux \
+	$(if $(BR2_PACKAGE_OPENSSL),openssl,)
+QPID_PROTON_CONF_OPTS = \
+	-DBUILD_JAVA=OFF \
+	-DENABLE_VALGRIND=OFF \
+	-DENABLE_WARNING_ERROR=OFF
+
+define QPID_PROTON_REMOVE_EXAMPLES
+	rm -fr $(TARGET_DIR)/usr/share/proton-$(QPID_PROTON_VERSION_MAJOR)/examples
+endef
+
+QPID_PROTON_POST_INSTALL_TARGET_HOOKS += QPID_PROTON_REMOVE_EXAMPLES
+
+$(eval $(cmake-package))
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 qpid-proton: new package

Quoted 7 lines · Luca Ceresoli

Note: the tarball is buggy, as is contains two leading components instead of one, the first being a dummy ".":

  $ tar taf ~/src/qpid-proton-0.9.1.tar.gz
  ./
  ./qpid-proton-0.9.1-rc1/
  ./qpid-proton-0.9.1-rc1/version.txt

Would it make sense to add an <PKG>_STRIP_COMPONENTS variable to handle this
case? There are a few other packages that have this problem.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
author
#2 lore raw

PATCH 1/1 qpid-proton: new package

Dear Arnout,

Quoted 11 lines · Arnout Vandecappelle
Quoted 7 lines · Luca Ceresoli

Note: the tarball is buggy, as is contains two leading components instead of one, the first being a dummy ".":

   $ tar taf ~/src/qpid-proton-0.9.1.tar.gz
   ./
   ./qpid-proton-0.9.1-rc1/
   ./qpid-proton-0.9.1-rc1/version.txt

Would it make sense to add an <PKG>_STRIP_COMPONENTS variable to handle this
case? There are a few other packages that have this problem.

Indeed! Four packages have the opposite problem and need to force --strip-components=0: intel-microcode, nanocom, tzdata and zic.

Thus, yes, it makes sense. I'll have a look.

Signature · 1 line
Luca