From patchwork Tue Feb 13 13:27:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 872848 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vDKZCm+D"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zgjyQ3JYTz9s7h for ; Wed, 14 Feb 2018 00:27:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8B2B5877FD; Tue, 13 Feb 2018 13:27:38 +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 kounI-ynUAxT; Tue, 13 Feb 2018 13:27:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id CF8718756C; Tue, 13 Feb 2018 13:27:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 310BE1C0533 for ; Tue, 13 Feb 2018 13:27:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2D69387F94 for ; Tue, 13 Feb 2018 13:27:35 +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 enHkuEgGwKKY for ; Tue, 13 Feb 2018 13:27:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 62BBD87F55 for ; Tue, 13 Feb 2018 13:27:34 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id f71so16024846wmf.0 for ; Tue, 13 Feb 2018 05:27:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=+b8vsZzWpUwN5NQj5qLC2fJR3YjS1y7E89ayijrd0Y8=; b=vDKZCm+DQV3bKmbnnR0N/iouuduoW+hapefnVVhx6UMSmw+KBTadCaVDyKOX783CNa uIiS5zfRvHGJRY6TTJfR9mAMcfD52kgHkJcgM4Giry17hRFRwqvpXswIE9OtaMRLC12z iDnNKSk/pku5ckDaRAdy3mFoXkOsOplG2wkKMv2Orzdlqi0QXbAwQlOfSOpf7OK5E2pO Y+9WW50qDBycJsSMQiL3FX0SICIn4EH0YYGsgWzbpnGV4I4PDEgVEjACd47j+cARIZv1 vcMtV0OA0A79nmKZPxzoopx2CTuwEenT8ReYk+CTtsA8vlg0CouJQ3rp1UGHHNCfr6RB HJog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+b8vsZzWpUwN5NQj5qLC2fJR3YjS1y7E89ayijrd0Y8=; b=IjbccRCMdHgBIJqIdyTW3UUSObzoIba09N5xDCcYVomIHbQbDCoT9TWYOakTicYk5H QG9UxmdtAiV2liaH/HgJXhHTCC58cyJ3w4yXzggJhJv1b1zh/zb2wXrUv66fUq8bKMLZ rohHH0EdnY8ogCKuVHKSPId7QkMnpjwbvJyVHMEUMb9BqzEo3Bwl2kR94mg1ABg6eCiu S558qTrfful3RHCIzS6/DGLYd39Af3e9Wmm9qR0R7lXI3eQU0X3sVJ7k0OwVMSJYJdJm XIQZehLmtGzzhOYWZxTTUNi1/ZpxglQAP+IA4KpqbBAEDu4JT54RlAnXUBT/3FADjnye nneg== X-Gm-Message-State: APf1xPAVSlMqxlEGhVAP635rcyPjlp0+NPE3SX5dCgxtWIOagr+M6Ujw hlt3J7DoHK152eZZmfcywTaqsrMG X-Google-Smtp-Source: AH8x226mG9XshO4/B8Piwn8JdKYKw2nF22AyFccb4DKr4eEawQF+aDCvQXqFsZuWsj/yB8vOBoCW4A== X-Received: by 10.28.109.10 with SMTP id i10mr1435207wmc.107.1518528452541; Tue, 13 Feb 2018 05:27:32 -0800 (PST) Received: from shrek.dav.id (LPuteaux-658-1-49-116.w92-154.abo.wanadoo.fr. [92.154.77.116]) by smtp.gmail.com with ESMTPSA id o11sm10956271wra.28.2018.02.13.05.27.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Feb 2018 05:27:31 -0800 (PST) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 13 Feb 2018 14:27:11 +0100 Message-Id: <20180213132711.17722-1-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH] ejabberd: Call check-erlang-lib script directly from its location X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , Johan Oudinet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Avoid installing check-erlang-lib in the directory where the tarball is extracted. Instead, use an absolute path to its actual location, i.e.: $(TOPDIR)/$(EJABBERD_PKGDIR)/check-erlang-lib Signed-off-by: Johan Oudinet --- package/ejabberd/ejabberd.mk | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index 0f7af9b83e..acd52e5b38 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -23,24 +23,15 @@ ifeq ($(BR2_PACKAGE_LINUX_PAM),y) EJABBERD_DEPENDENCIES += linux-pam endif -# Install check-erlang-lib script to the directory in which the -# package has been uncompressed, so it is available during the -# configure step. -define EJABBERD_INSTALL_CHECK_ERLANG_LIB - $(INSTALL) -m 0755 $(EJABBERD_PKGDIR)/check-erlang-lib \ - $(@D)/check-erlang-lib -endef - -EJABBERD_POST_EXTRACT_HOOKS += EJABBERD_INSTALL_CHECK_ERLANG_LIB - EJABBERD_ERLANG_LIBS = sasl public_key mnesia inets compiler # Guess answers for these tests, configure will bail out otherwise # saying error: cannot run test program while cross compiling. +EJABBERD_CHECK_LIB = $(TOPDIR)/$(EJABBERD_PKGDIR)/check-erlang-lib EJABBERD_CONF_ENV = \ ac_cv_erlang_root_dir="$(HOST_DIR)/lib/erlang" \ $(foreach lib,$(EJABBERD_ERLANG_LIBS), \ - ac_cv_erlang_lib_dir_$(lib)="`./check-erlang-lib $(lib)`") + ac_cv_erlang_lib_dir_$(lib)="`$(EJABBERD_CHECK_LIB) $(lib)`") EJABBERD_CONF_OPTS = \ --enable-system-deps \