From patchwork Tue Oct 30 12:24:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Hermant X-Patchwork-Id: 195477 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 5FCD32C00B5 for ; Tue, 30 Oct 2012 23:24:30 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id F3C9C3125F; Tue, 30 Oct 2012 12:24:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nUPI4fNtrnob; Tue, 30 Oct 2012 12:24:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 1933031253; Tue, 30 Oct 2012 12:24:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C97E08F783 for ; Tue, 30 Oct 2012 12:24:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 222AA84152 for ; Tue, 30 Oct 2012 12:24:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iqgiIG81xSPj for ; Tue, 30 Oct 2012 12:24:14 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mo-p00-ob.rzone.de (mo-p00-ob.rzone.de [81.169.146.161]) by whitealder.osuosl.org (Postfix) with ESMTPS id 47A1385A83 for ; Tue, 30 Oct 2012 12:24:14 +0000 (UTC) X-RZG-AUTH: :K34Bck+6YrEgjuBfzmrkukPJhhbHEm1G+2SCnvvjhur6rsGj/jgixsrTkwdMQP1Z/nY9Ces+2B2gLRbrTCs= X-RZG-CLASS-ID: mo00 Received: from ghermant-Q310.home (ALyon-754-1-31-202.w90-15.abo.wanadoo.fr [90.15.174.202]) by smtp.strato.de (joses mo24) (RZmta 30.21 DYNA|AUTH) with ESMTPA id v042afo9UBeNIr ; Tue, 30 Oct 2012 13:24:11 +0100 (CET) From: Gregory Hermant To: buildroot@busybox.net Date: Tue, 30 Oct 2012 13:24:02 +0100 Message-Id: <1351599843-24291-3-git-send-email-gregory.hermant@calao-systems.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351599843-24291-1-git-send-email-gregory.hermant@calao-systems.com> References: <1351599843-24291-1-git-send-email-gregory.hermant@calao-systems.com> Subject: [Buildroot] [PATCH] package: add linknx X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Gregory Hermant --- package/Config.in | 1 + package/linknx/Config.in | 20 ++++++++++++ .../linknx-0.0.1.30-fix-pthsem-config-issue.patch | 33 ++++++++++++++++++++ ...0.0.1.30-link-with-libdl-when-lua-enabled.patch | 27 ++++++++++++++++ package/linknx/linknx.mk | 25 +++++++++++++++ 5 files changed, 106 insertions(+) create mode 100644 package/linknx/Config.in create mode 100644 package/linknx/linknx-0.0.1.30-fix-pthsem-config-issue.patch create mode 100644 package/linknx/linknx-0.0.1.30-link-with-libdl-when-lua-enabled.patch create mode 100644 package/linknx/linknx.mk diff --git a/package/Config.in b/package/Config.in index a6d0517..3dd169f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -582,6 +582,7 @@ source "package/kismet/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/lighttpd/Config.in" endif +source "package/linknx/Config.in" source "package/links/Config.in" source "package/linphone/Config.in" source "package/lrzsz/Config.in" diff --git a/package/linknx/Config.in b/package/linknx/Config.in new file mode 100644 index 0000000..c5b49af --- /dev/null +++ b/package/linknx/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_LINKNX + bool "linknx" + select BR2_PACKAGE_LIBPTHSEM + help + Linknx is only one component of a bigger project.The goal is to get + the maximum comfort and flexibility from a KNX domotic system while + keeping the smallest possible resource consumption. + + http://belnet.dl.sourceforge.net/sourceforge/linknx/ + +if BR2_PACKAGE_LINKNX + +config BR2_PACKAGE_LINKNX_LUA + bool "lua support" + depends on BR2_PACKAGE_LINKNX + select BR2_PACKAGE_LUA + help + Enable Lua support. + +endif diff --git a/package/linknx/linknx-0.0.1.30-fix-pthsem-config-issue.patch b/package/linknx/linknx-0.0.1.30-fix-pthsem-config-issue.patch new file mode 100644 index 0000000..82649f0 --- /dev/null +++ b/package/linknx/linknx-0.0.1.30-fix-pthsem-config-issue.patch @@ -0,0 +1,33 @@ +From 8129fd135b0674017854fd722105eb0558cd3987 Mon Sep 17 00:00:00 2001 +From: Gregory Hermant +Date: Mon, 22 Oct 2012 15:29:43 +0200 +Subject: [PATCH] Prevent pthsem-config script to return bad include path. + +During the bcusdk configuration step, the script pthsem-config +is used to return some parameters about the pthsem library location. +Unfortunately this script returns host include path and prevents +the bcusdk build. + +Signed-off-by: Gregory Hermant +--- + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 843e017..f77d5a9 100755 +--- a/configure ++++ b/configure +@@ -15958,8 +15958,8 @@ if test ".$with_pth" != .no; then + if test ".$_pth_version" != .; then + _pth_location=`$_dir/pthsem-config --prefix` + _pth_type="installed" +- _pth_cppflags=`$_dir/pthsem-config --cflags` +- _pth_cflags=`$_dir/pthsem-config --cflags` ++# _pth_cppflags=`$_dir/pthsem-config --cflags` ++# _pth_cflags=`$_dir/pthsem-config --cflags` + _pth_ldflags=`$_dir/pthsem-config --ldflags` + _pth_libs=`$_dir/pthsem-config --libs --all` + _pth_found=yes +-- +1.7.9.5 + diff --git a/package/linknx/linknx-0.0.1.30-link-with-libdl-when-lua-enabled.patch b/package/linknx/linknx-0.0.1.30-link-with-libdl-when-lua-enabled.patch new file mode 100644 index 0000000..22fea47 --- /dev/null +++ b/package/linknx/linknx-0.0.1.30-link-with-libdl-when-lua-enabled.patch @@ -0,0 +1,27 @@ +From 6e377c72555ffc5f9b729292b802440f155854d7 Mon Sep 17 00:00:00 2001 +From: Gregory Hermant +Date: Mon, 29 Oct 2012 17:45:43 +0100 +Subject: [PATCH] Link with libdl when lua is enabled + + +Signed-off-by: Gregory Hermant +--- + src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 9eccf8d..90e02f0 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -184,7 +184,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LOG4CPP_CFLAGS) $(LUA_CFLAGS) +-linknx_LDADD = ../ticpp/libticpp.a $(PTH_LDFLAGS) $(PTH_LIBS) $(LIBCURL) $(LOG4CPP_LIBS) $(LUA_LIBS) -lm ++linknx_LDADD = ../ticpp/libticpp.a $(PTH_LDFLAGS) $(PTH_LIBS) $(LIBCURL) $(LOG4CPP_LIBS) $(LUA_LIBS) -lm -ldl + linknx_SOURCES = linknx.cpp logger.cpp ruleserver.cpp objectcontroller.cpp eibclient.c threads.cpp timermanager.cpp persistentstorage.cpp xmlserver.cpp smsgateway.cpp emailgateway.cpp knxconnection.cpp services.cpp suncalc.cpp luacondition.cpp ioport.cpp ruleserver.h objectcontroller.h threads.h timermanager.h persistentstorage.h xmlserver.h smsgateway.h emailgateway.h knxconnection.h services.h suncalc.h luacondition.h ioport.h logger.h + all: all-am + +-- +1.7.9.5 + diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk new file mode 100644 index 0000000..219eca4 --- /dev/null +++ b/package/linknx/linknx.mk @@ -0,0 +1,25 @@ +############################################################# +# +# linknx +# +############################################################# + +LINKNX_VERSION = 0.0.1.30 +LINKNX_SOURCE = linknx-${LINKNX_VERSION}.tar.gz +LINKNX_SITE = http://sourceforge.net/projects/linknx/files/linknx/linknx-0.0.1.30/ +LINKNX_LICENSE = GPLv2+ +LINKNX_LICENSE_FILES = COPYING +LINKNX_INSTALL_STAGING = YES +LINKNX_INSTALL_TARGET = YES +LINKNX_CONF_OPT = --without-log4cpp --without-pth-test \ + --with-pth=$(STAGING_DIR)/usr +LINKNX_DEPENDENCIES = libpthsem + +ifeq ($(BR2_PACKAGE_LUA),y) +LINKNX_DEPENDENCIES += lua +LINKNX_CONF_OPT += --with-lua +else +LINKNX_CONF_OPT += --without-lua +endif + +$(eval $(autotools-package))