From patchwork Fri Jul 11 14:43:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 369185 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 0807E140085 for ; Sat, 12 Jul 2014 00:44:18 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2B9948C48E; Fri, 11 Jul 2014 14:44:18 +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 wcyxbRngIXYH; Fri, 11 Jul 2014 14:44:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8E78A8C424; Fri, 11 Jul 2014 14:44:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 5728B1BF83B for ; Fri, 11 Jul 2014 14:44:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 53CC688424 for ; Fri, 11 Jul 2014 14:44:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sZZARVPzlSwL for ; Fri, 11 Jul 2014 14:44:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 69B6D87DF9 for ; Fri, 11 Jul 2014 14:44:15 +0000 (UTC) Received: by mail-wi0-f174.google.com with SMTP id d1so4124733wiv.13 for ; Fri, 11 Jul 2014 07:44:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=VVIajZfw8qaELeWnoGg8dMHTcr/3f6WjbJxOWwOyKbg=; b=lC18NPsQDcCT6RO6ud/PZ7N2Ne52PIY9JjVTaW47Ke+mLd+qG4Cp0PEhFlTbZawxQD 4oMOY6+Xp9kyHApThUgChGweDd2NTzPiFRbQmuj9eWjwui1wxN+mFeQvit0EAAgCfmt4 4bf8NC7xCj63tBKXXSpYtKkDrJWqktGasLr4qonjFlrUOavvXZjBJ+FACSVmgFmTTHwB 23fN5QzX46Q/lLtGQytn68UcHVxhh72EJ+epDrvjtXIlP8Gto5L6uUy3dw89fsHt6o7m sBEXtTbs9iuGBHlJVFwBEcGqW2y1lE+rrnyBwjRFIyqrgzXn0TlhhCMJYgoWet1NL0ox DjkA== X-Received: by 10.194.219.225 with SMTP id pr1mr42901735wjc.34.1405089849437; Fri, 11 Jul 2014 07:44:09 -0700 (PDT) Received: from localhost.localdomain ([193.51.194.207]) by mx.google.com with ESMTPSA id w10sm8137388wie.22.2014.07.11.07.44.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Jul 2014 07:44:08 -0700 (PDT) From: Johan Oudinet To: buildroot@buildroot.org Date: Fri, 11 Jul 2014 16:43:46 +0200 Message-Id: <1405089826-31432-1-git-send-email-johan.oudinet@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH 1/1] ejabberd: new package 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: Johan Oudinet --- package/Config.in | 1 + package/ejabberd/Config.in | 13 ++++++++ package/ejabberd/check-erlang-lib | 48 +++++++++++++++++++++++++++++ package/ejabberd/ejabberd.mk | 65 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 127 insertions(+) create mode 100644 package/ejabberd/Config.in create mode 100755 package/ejabberd/check-erlang-lib create mode 100644 package/ejabberd/ejabberd.mk diff --git a/package/Config.in b/package/Config.in index c626968..8b57be1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -937,6 +937,7 @@ endif source "package/dnsmasq/Config.in" source "package/dropbear/Config.in" source "package/ebtables/Config.in" + source "package/ejabberd/Config.in" source "package/ethtool/Config.in" source "package/faifa/Config.in" source "package/fmc/Config.in" diff --git a/package/ejabberd/Config.in b/package/ejabberd/Config.in new file mode 100644 index 0000000..3a2336d --- /dev/null +++ b/package/ejabberd/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_EJABBERD + bool "ejabberd" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_ERLANG + select BR2_PACKAGE_LIBYAML + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_EXPAT + help + Ejabberd is a Jabber/XMPP instant messaging server, written + in Erlang/OTP. Among other features, ejabberd is + cross-platform, fault-tolerant, clusterable and modular. + + http://www.ejabberd.im diff --git a/package/ejabberd/check-erlang-lib b/package/ejabberd/check-erlang-lib new file mode 100755 index 0000000..1a942bb --- /dev/null +++ b/package/ejabberd/check-erlang-lib @@ -0,0 +1,48 @@ +#!/bin/sh -e +# Helper to bypass AC_ERLANG_CHECK_LIB + +usage() { + cat <&2 + exit 1 +} + +if [ $# -ne 1 ]; then + usage + exit 0 +else + library="$1" +fi + +target_dir="${TARGET_DIR:-../../output/target}" + +[ -d "$target_dir" ] || die "TARGET_DIR is not a directory. Please \ +specify the TARGET_DIR environment variable." + +case "$(ls -1d -- "$target_dir/usr/lib/erlang/lib/$library-"* | wc -l)" in + 0) + echo "not found" + ;; + 1) + echo "$target_dir/usr/lib/erlang/lib/$library-"* \ + | sed -e "s,^$target_dir,," + ;; + *) + die "Several versions of $library have been found. Please \ + remove the unused ones." + ;; +esac diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk new file mode 100644 index 0000000..7573d63 --- /dev/null +++ b/package/ejabberd/ejabberd.mk @@ -0,0 +1,65 @@ +################################################################################ +# +# ejabberd +# +################################################################################ + +EJABBERD_VERSION = 14.05 +EJABBERD_SITE = $(call github,processone,ejabberd,$(EJABBERD_VERSION)) +EJABBERD_LICENSE = GPLv2+ +EJABBERD_LICENSE_FILES = COPYING +EJABBERD_DEPENDENCIES = libyaml expat openssl erlang + +ifeq ($(BR2_PACKAGE_LIBICONV),y) + EJABBERD_DEPENDENCIES += libiconv +endif + +EJABBERD_ERLANG_LIBS := sasl crypto public_key ssl mnesia inets compiler + +# Do AC_ERLANG_CHECK_LIB job without erlang. +define EJABBERD_SET_LIBS_DIR + for lib in $(EJABBERD_ERLANG_LIBS); do \ + export \ + erlang_lib_dir_$$lib="`package/ejabberd/check-erlang-lib $$lib`"; \ + done +endef + +# Set cross-compilation options to the configure called by rebar. +define EJABBERD_FIX_REBAR_CONFIG_SCRIPT + sed -e "s,./configure,./configure \\ \ + --target=$(GNU_TARGET_NAME) \\ \ + --host=$(GNU_TARGET_NAME) \\ \ + --build=$(GNU_HOST_NAME)," \ + -i "$(@D)"/rebar.config.script +endef + +EJABBERD_PRE_CONFIGURE_HOOKS += \ + EJABBERD_SET_LIBS_DIR \ + EJABBERD_FIX_REBAR_CONFIG_SCRIPT + +# Guess answers for these tests, configure will bail out otherwise +# saying error: cannot run test program while cross compiling. +EJABBERD_CONF_ENV = \ + ac_cv_erlang_root_dir='$(HOST_DIR)/usr/lib/erlang' \ + $(foreach lib, $(EJABBERD_ERLANG_LIBS), \ + ac_cv_erlang_lib_dir_$(lib)="$$erlang_lib_dir_$(lib)") + +# Set environment variables so the rebar compile command does +# cross-compile ejabberd dependencies. +EJABBERD_MAKE_ENV = \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + LDFLAGS="-L$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/sysroot/usr/lib/erlang/usr/lib" + +# Delete HOST_DIR prefix from ERL path in ejabberctl script. +define EJABBERD_FIX_EJABBERDCTL + sed -e "s,ERL=$(HOST_DIR),ERL=," -i "$(TARGET_DIR)"/usr/sbin/ejabberdctl +endef + +EJABBERD_POST_INSTALL_TARGET_HOOKS += EJABBERD_FIX_EJABBERDCTL + +define EJABBERD_USERS +ejabberd -1 ejabberd -1 * - - - ejabberd daemon +endef + +$(eval $(autotools-package))