From 1acff22d5e34a91ed6e2f87312962160612fbd3d Mon Sep 17 00:00:00 2001 From: Denis Bodor Date: Wed, 12 Mar 2014 11:04:17 +0100 Subject: [PATCH] libstrophe: new package [Thomas: allow compilation with either expat or libxml2, reword the license description to indicate that it's MIT *or* GPLv3. ] Signed-off-by: Denis Bodor Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/libstrophe/Config.in | 11 +++++++ .../libstrophe-01-make-autoreconfable.patch | 13 +++++++++ package/libstrophe/libstrophe.mk | 29 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 package/libstrophe/Config.in create mode 100644 package/libstrophe/libstrophe-01-make-autoreconfable.patch create mode 100644 package/libstrophe/libstrophe.mk diff --git a/package/Config.in b/package/Config.in index 2fee0ef800..394f0a5d95 100644 --- a/package/Config.in +++ b/package/Config.in @@ -732,6 +732,7 @@ source "package/librsync/Config.in" source "package/libsocketcan/Config.in" source "package/libshairplay/Config.in" source "package/libsoup/Config.in" +source "package/libstrophe/Config.in" source "package/libtirpc/Config.in" source "package/libtorrent/Config.in" source "package/libupnp/Config.in" diff --git a/package/libstrophe/Config.in b/package/libstrophe/Config.in new file mode 100644 index 0000000000..d4e6a7d2e2 --- /dev/null +++ b/package/libstrophe/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBSTROPHE + bool "libstrophe" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBXML2 if !BR2_PACKAGE_EXPAT + help + libstrophe is a lightweight XMPP client library written in C. + It has minimal dependencies and is configurable for various + environments. It runs well on both Linux, Unix, and Windows + based platforms. + + https://github.com/strophe/libstrophe diff --git a/package/libstrophe/libstrophe-01-make-autoreconfable.patch b/package/libstrophe/libstrophe-01-make-autoreconfable.patch new file mode 100644 index 0000000000..98da3f47cc --- /dev/null +++ b/package/libstrophe/libstrophe-01-make-autoreconfable.patch @@ -0,0 +1,13 @@ +Make the package autoreconfigurable + +Signed-off-by: Denis Bodor + +diff -ur libstrophe.orig/Makefile.am libstrophe/Makefile.am +--- libstrophe.orig/Makefile.am 2014-03-02 18:58:36.219753865 +0100 ++++ libstrophe/Makefile.am 2014-03-02 18:58:02.739752477 +0100 +@@ -1,4 +1,4 @@ +-AUTOMAKE_OPTIONS = subdir-objects ++AUTOMAKE_OPTIONS = subdir-objects foreign + + CFLAGS = -g -Wall + diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk new file mode 100644 index 0000000000..1bd55c7cc4 --- /dev/null +++ b/package/libstrophe/libstrophe.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# libstrophe +# +################################################################################ + +LIBSTROPHE_VERSION = d408eaf2bbfe5ff5c56eab01463c278f9891c08e +LIBSTROPHE_SITE = $(call github,strophe,libstrophe,$(LIBSTROPHE_VERSION)) +LIBSTROPHE_DEPENDENCIES = openssl host-pkgconf +LIBSTROPHE_AUTORECONF = YES +LIBSTROPHE_LICENSE = MIT or GPLv3 +LIBSTROPHE_LICENSE_FILES = MIT-LICENSE.txt GPL-LICENSE.txt + +# This package does not build a dynamic library, so there is nothing +# to be installed to the target. +LIBSTROPHE_INSTALL_STAGING = YES +LIBSTROPHE_INSTALL_TARGET = NO + +ifeq ($(BR2_PACKAGE_EXPAT),y) +# Passing --without-libxml2 doesn't work, due to how AC_ARG_WITH is +# used in configure.ac. As long as --with-libxml2 is *not* passed, the +# configure script assumes expat should be used. +LIBSTROPHE_DEPENDENCIES += expat +else +LIBSTROPHE_CONF_OPT += --with-libxml2 +LIBSTROPHE_DEPENDENCIES += libxml2 +endif + +$(eval $(autotools-package))