From patchwork Sun May 7 04:32:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 759395 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wLCRT4q2rz9s8D for ; Sun, 7 May 2017 14:32:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 27E43302D0; Sun, 7 May 2017 04:32:44 +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 N9UyhCQZxxyG; Sun, 7 May 2017 04:32:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 454E92F9A5; Sun, 7 May 2017 04:32:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id AA75B1C0F86 for ; Sun, 7 May 2017 04:32:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A2BB886E97 for ; Sun, 7 May 2017 04:32:35 +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 2vnnF-rMcdSj for ; Sun, 7 May 2017 04:32:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.datacom.ind.br (mx.datacom.ind.br [177.66.5.10]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 0A6D086E96 for ; Sun, 7 May 2017 04:32:32 +0000 (UTC) Received: from mail.datacom.ind.br (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTPS id 3278618A47FA; Sun, 7 May 2017 01:32:26 -0300 (BRT) Received: from localhost (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTP id 200F418A496E; Sun, 7 May 2017 01:32:26 -0300 (BRT) Received: from mail.datacom.ind.br ([127.0.0.1]) by localhost (mail.datacom.ind.br [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id q5uOX9urwYiO; Sun, 7 May 2017 01:32:26 -0300 (BRT) Received: from p7-1130br.casantos.org (189.27.236.64.dynamic.adsl.gvt.net.br [189.27.236.64]) by mail.datacom.ind.br (Postfix) with ESMTPSA id BCC7818A47FA; Sun, 7 May 2017 01:32:25 -0300 (BRT) From: Carlos Santos To: buildroot@buildroot.org Date: Sun, 7 May 2017 01:32:18 -0300 Message-Id: <1494131541-2960-1-git-send-email-casantos@datacom.ind.br> X-Mailer: git-send-email 2.7.4 Cc: "Yann E . MORIN" Subject: [Buildroot] [PATCH v2 1/4] core: reverse the argument order in check-host-cmake X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Pass the minimal version before the program name. In a later change the script will become able to test a list of candidates. Signed-off-by: Carlos Santos Acked-by: "Yann E. MORIN" --- support/dependencies/check-host-cmake.mk | 2 +- support/dependencies/check-host-cmake.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk index 8002278..914327f 100644 --- a/support/dependencies/check-host-cmake.mk +++ b/support/dependencies/check-host-cmake.mk @@ -12,7 +12,7 @@ BR2_CMAKE_VERSION_MIN = 3.1 BR2_CMAKE ?= cmake ifeq ($(call suitable-host-package,cmake,\ - $(BR2_CMAKE) $(BR2_CMAKE_VERSION_MIN)),) + $(BR2_CMAKE_VERSION_MIN) $(BR2_CMAKE)),) BR2_CMAKE = $(HOST_DIR)/usr/bin/cmake BR2_CMAKE_HOST_DEPENDENCY = host-cmake endif diff --git a/support/dependencies/check-host-cmake.sh b/support/dependencies/check-host-cmake.sh index 9b63b06..73bd4ed 100755 --- a/support/dependencies/check-host-cmake.sh +++ b/support/dependencies/check-host-cmake.sh @@ -1,7 +1,7 @@ #!/bin/sh -candidate="${1}" -version_min="${2}" +version_min="${1}" +candidate="${2}" major_min="${version_min%.*}" minor_min="${version_min#*.}"