From patchwork Fri Oct 27 12:49:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 117329 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp742182qgn; Fri, 27 Oct 2017 06:00:51 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Qkt44UUs1KxtS4WlxqMWhNrg9P/6gh5a3j7FFuZibXtfTeMpGs8CdCixWvExr9gfDm6s+u X-Received: by 10.107.47.11 with SMTP id j11mr438997ioo.225.1509109251046; Fri, 27 Oct 2017 06:00:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509109251; cv=none; d=google.com; s=arc-20160816; b=G/y6EJZscESJNuV9aIt2JkrI9jwsqXMsTeio5yad30Zr3IbFWNwAJCoDQZXqYZNgDa ct2hvvu+ffJS65QRIpVnAImEqi1ggYpAcf5YGE/CMAsYqkZteKMJj2KO0nFerfPrWsv+ hIBjrV/egfFMhaYUm5tor/yIuCXBCJOw97q42HCYj9dhiR+wvbVeziZf+1oms4iQHEpq ehuXoX1hTYCtHkA0tzS+35k/7PViNFP8mEkoX0e8Rh8rtcxxlRRt7hgasRkBIRIH7yaF 4SSGS4HJ4nnjzUto0d+btzdPqHjy+yyZ61iuDGsy9pum/YrGheUyFde9jH5xjbzBDj8+ u36Q== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=wqBBBrZy+g5/JuGTIoyeRl+RLlz4YG+AOYpxxp0bvF8=; b=vF5vMEmxIAEXEkfIcnNiN07r55zHyyu6vqKQRrNh6xl+aoOs7uAeN/pDhKIuo6+JDv I5FCn/xmkwkX7AEVt8bC7jKh3FyoVAwmkDafZRK6AP0/J6Vs9So/KUN+ifAJTvr6/AiP 4C45cKWPXblKoivlcuM8UnYRXjiE3vRMtlZKYNoTL6IlpIP1Xx+XuwmpnzIqMTsrClf2 cYLCzdSldIkDfOPgwR60inf2Hw8gdtqMWf0yis2aqmONZXIwVjwYGNqscksJ0yvyHPC6 TKS1nklxc9BoMkYJfdI8VWV9YsiBTjHCNwpARdGM+S/6BUCZdTSQkNh3y5WiBjM1DsXs VwMQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id u7si1263719itd.45.2017.10.27.06.00.50; Fri, 27 Oct 2017 06:00:51 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 9AF1162956; Fri, 27 Oct 2017 13:00:50 +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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 B8D686297E; Fri, 27 Oct 2017 12:51:51 +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 142CC62980; Fri, 27 Oct 2017 12:51:44 +0000 (UTC) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by lists.linaro.org (Postfix) with ESMTPS id A95D86294D for ; Fri, 27 Oct 2017 12:50:33 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id 90so7286362lfs.13 for ; Fri, 27 Oct 2017 05:50:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=wqBBBrZy+g5/JuGTIoyeRl+RLlz4YG+AOYpxxp0bvF8=; b=LHybB3rA1iEvMx4LPTrFztreYaIATgmugi02Y159uFPMkxdO9J4xqwwWr9ayhfwfAt Djm+AUe0HnDy8VMCY278FSQFTk2RVReC76z5ze0CPtNeGNhEYKWORHEkiK9WxxWvcK6c lXIAeIbRCLzmv6boIjTUET56tCcUFzt61nhLixBTfO69pPmJMeoryGvZuy3bDxKXu7O6 5LBcqc984iA77hP7IPGYVOOdmifrwe5fn2EFUp3Tu0w287Xx1hfGxSzxJKoXF49mixVN 4C071maaTnbOTwrOUjjaLx5dmi+iWo/qdX5SRAnt2aPVzAIklmvyV72tQ2Vag1vSo0f8 2UsA== X-Gm-Message-State: AMCzsaWgfX1S9yYFD9mL40KKUB3WrZrwB1uv9o/2ZRs7dfAoavxBfHlv mYJm0JM0nP65QVbc1r8XpI9EACZnfLNouQ== X-Received: by 10.46.93.201 with SMTP id v70mr176315lje.8.1509108632304; Fri, 27 Oct 2017 05:50:32 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.222]) by smtp.gmail.com with ESMTPSA id l194sm1584690lfl.11.2017.10.27.05.50.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Oct 2017 05:50:31 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Fri, 27 Oct 2017 15:49:54 +0300 Message-Id: <20171027125014.27313-11-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171027125014.27313-1-dmitry.ereminsolenikov@linaro.org> References: <20171027125014.27313-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH v10 10/30] include: install and use ABI headers only in ABI-compat mode 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" There is no need to install ABI headers (or to have them in include path) in non-ABI-compat mode, they should not be used at all. Still provide default ABI headers, because platform may depend on them. Signed-off-by: Dmitry Eremin-Solenikov --- Makefile.inc | 6 +++++- include/Makefile.am | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) -- 2.14.2 diff --git a/Makefile.inc b/Makefile.inc index 10e4041fe662..11fc7c759c85 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -3,9 +3,13 @@ ODP_INCLUDES = \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/include +if ODP_ABI_COMPAT +ODP_INCLUDES += \ + -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +endif + HELPER_INCLUDES = \ -I$(top_srcdir)/helper/include diff --git a/include/Makefile.am b/include/Makefile.am index d841e65b8795..9437f5f68d5a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -110,6 +110,9 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/queue.h \ odp/api/abi-default/shared_memory.h +# Insall ABI headers only if required +if ODP_ABI_COMPAT + odpapiabiarchincludedir= $(includedir)/odp/api/abi if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ @@ -321,6 +324,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h \ odp/arch/x86_64-linux/odp/api/abi/version.h endif +endif # ODP_ABI_COMPAT # Rerefence all nodist_*_HEADERS here .PHONY: $(nodist_odpapispecinclude_HEADERS)