From patchwork Fri Sep 8 11:00:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 112058 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp130745qgf; Fri, 8 Sep 2017 04:02:04 -0700 (PDT) X-Google-Smtp-Source: AOwi7QA/TNu0b/Ii3nnqsSlmfVkZEk3XC9/D6mHnhDVeyZTGAq9GBWZgzhC9SNboyP5s353XFm26 X-Received: by 10.237.49.100 with SMTP id 91mr3209646qtg.189.1504868524748; Fri, 08 Sep 2017 04:02:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504868524; cv=none; d=google.com; s=arc-20160816; b=qpdoiXm9wsA2/PgCkjkh8nulZKCG7C5al/EVgQrTIRLt0AATYnaGF+3VTsxo/11E13 EaoMsM9Iz1tsSlhlB3vo5apjBAim7xkurq1ORYp6dDrDhlu08gO3ROxW1DHtOEBHru7S 8NMvenoHHF+sWOVG+KmqlkNW5yliinPStVAfM7bQf/dK0I+Wric2PxzANEEp/7SOe2Py ue2gqEctojpmVZ6IlBYN+DY+fUmlqddiV+a5hE2EE45FH/3Gt+/tbGBWOiMob6gDWCdN +fX80rLEpBk5mWzdkd12L4+YI+bgdoXcKKVoOW1EtVwDzyMPqfy4Twh/GJICwJVSwg08 fMVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=o9nTIcR9l3WQkIk7pj0Aex991Op2JY1teL/qFO7UtSg=; b=SIAfInOmSElghTL5SFPbtK3BmMNLC55RpXGr3Lm5OsKXkO9UAryHOrSHl9XM7h+kID zepOtm6675RSetWc029d+fWM79BeroeJDv87oE5Idbz3VVpav5u4dc1iBzOjNwgHcUML lKJTAL9oFhwnwBma0kETPm0LizBtX6l6XFo1G5iUL1UMtbxEDml8FXFpjmjc4S3pyWBr G7rp20kkz7wZ7BTxANBzqu561QcqR/woEML8h3F8VpW491WkYrrMQFfDq8GB6eLQnsJN MAsxgV9Id6Fg4EN6RuAOYswzEltOoIy7BtHcQ5bylxsFuRpLsSZAtQ//rfndwYGoZb20 ZP+w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id s20si1802120qtc.297.2017.09.08.04.02.04; Fri, 08 Sep 2017 04:02:04 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 62BBD60999; Fri, 8 Sep 2017 11:02:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 46409609E7; Fri, 8 Sep 2017 11:00:39 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id D6C8B60961; Fri, 8 Sep 2017 11:00:25 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id 3F44960999 for ; Fri, 8 Sep 2017 11:00:16 +0000 (UTC) Received: from mxback14j.mail.yandex.net (mxback14j.mail.yandex.net [IPv6:2a02:6b8:0:1619::90]) by forward105p.mail.yandex.net (Yandex) with ESMTP id D6E964083114 for ; Fri, 8 Sep 2017 14:00:14 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback14j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id N0lS3gLli9-0EM4Pp7f; Fri, 08 Sep 2017 14:00:14 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id hlbb8BpUnk-0Eb0r4rQ; Fri, 08 Sep 2017 14:00:14 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 8 Sep 2017 14:00:08 +0300 Message-Id: <1504868409-30780-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504868409-30780-1-git-send-email-odpbot@yandex.ru> References: <1504868409-30780-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 162 Subject: [lng-odp] [PATCH v1 2/3] test: try detecting CUnit location, if it is not found by pkg-config X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov CUnit 2.1-2 supplied incorrect cunit.pc file, resulting in pkg-config failing to detect library. Try checking CUnit header/library in case of pkg-config failure. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 162 (lumag:fix-deps) ** https://github.com/Linaro/odp/pull/162 ** Patch: https://github.com/Linaro/odp/pull/162.patch ** Base sha: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: 987b9e6d4ee471b03e4710fb7f50f9cf2d03ce65 **/ test/common_plat/m4/validation.m4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/common_plat/m4/validation.m4 b/test/common_plat/m4/validation.m4 index e303f8f20..78c4ec03a 100644 --- a/test/common_plat/m4/validation.m4 +++ b/test/common_plat/m4/validation.m4 @@ -12,7 +12,13 @@ AM_CONDITIONAL([test_vald], [test x$test_vald = xyes ]) ########################################################################## cunit_support=$test_vald AS_IF([test "x$cunit_support" = "xyes"], - [PKG_CHECK_MODULES([CUNIT], [cunit])]) + [PKG_CHECK_MODULES([CUNIT], [cunit], [], + [AC_MSG_WARN([pkg-config could not find CUnit, guessing]) + AC_CHECK_HEADERS([CUnit/Basic.h], [], + [AC_MSG_ERROR(["can't find CUnit headers"])]) + AC_CHECK_LIB([cunit],[CU_get_error], [CUNIT_LIBS="-lcunit"], + [AC_MSG_ERROR([CUnit libraries required])]) +])]) AC_SUBST([CUNIT_CFLAGS]) AC_SUBST([CUNIT_LIBS])