From patchwork Thu Oct 5 09:00:14 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: 114867 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp382326qgn; Thu, 5 Oct 2017 02:30:35 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDL6nhs5PjlAUzXbL4KqwFHAp+7xS9sbCWSuMk6ntSGzrkN5vuHzIao9pPscXwawmV0B9rz X-Received: by 10.233.239.215 with SMTP id d206mr13975449qkg.59.1507195835346; Thu, 05 Oct 2017 02:30:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507195835; cv=none; d=google.com; s=arc-20160816; b=odqS5MwRUrfmfrHXHZsXRO2PHxziw2zRNn+sx51u7KRMt8JAeO9REAjQ/4j1L4Xftw r08yl0T/SAydjFlTcabbV7pqp1+pzbBxkRaDETe5H6ww2CNXQo7ybMdEJEzx/95hvIil TKANO8W3nBUzfbXNBTAxZIjeQBVks/8b1Y+azVY9/V0/8C467E3eJ8oDwmjt4Yct6A2+ Wrh89EFHXYtwloj+JUJKG7tMGeG3zW0mEMENkp/OFrhJVl8u4KioZDpfrrtJrO1UaHsE IgdKszIGue1hy5kvvKZ/0HeNlTb97fInzg12Kc6O1QzZASQ1/mxgtbuhF1UNYc3xw6ND SlDw== 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=RwNI/a2eRMLyYT5MNFnR7n387UlCwhRobTUbqiIpGDI=; b=GnFWCFCSML6LWbV0W9RBYodaz04AkAQ9dPBre5KudlH2NBp4fJ37NgE2XC02/sJegt rd8bURPvMrBnIlSZ5Thj7WvArhApRqpPGSWVLtWlDI2XUGJe7RSdhmCJHkMVi/9cXPkj yKMcP1F5UAtWF7tfN+kLTUWqXCWGpM2TbXScMqaO5ET5hccF5JEBkMTy5VjHbGg/ODnb IfPQZPuIyY0+m0uWTtWffLnUi9T5v3Y2T+ELnwzqc5pkBxkeApOtbbT267CkjEdys94m tS/VfnjyXlkqVnhmCqyeq1gtV2xow1q7/zbxPOkrEdb6tVPFKnXI/T3UV+bQtz0dGQDq zmsQ== 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 a22si5800251qth.197.2017.10.05.02.30.35; Thu, 05 Oct 2017 02:30:35 -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 E77DC644CE; Thu, 5 Oct 2017 09:30:34 +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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 A972965BC0; Thu, 5 Oct 2017 09:04:45 +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 563F065BC0; Thu, 5 Oct 2017 09:04:43 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 490EB644B6 for ; Thu, 5 Oct 2017 09:00:59 +0000 (UTC) Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward104p.mail.yandex.net (Yandex) with ESMTP id CC2B618502D for ; Thu, 5 Oct 2017 12:00:48 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id zBjMWl57Pl-0mDSBuGg; Thu, 05 Oct 2017 12:00:48 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id crpg26GhCG-0ma86YEH; Thu, 05 Oct 2017 12:00:48 +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: Thu, 5 Oct 2017 12:00:14 +0300 Message-Id: <1507194018-5453-17-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> References: <1507194018-5453-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v1 16/20] include: include all ABI files into distribution 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 Due to the way Automake interacts with autoconf substitutions, ODP tarballs included ABI headers only for the current directory. Include all ABI headers into tarball. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 213 (lumag:plat-def) ** https://github.com/Linaro/odp/pull/213 ** Patch: https://github.com/Linaro/odp/pull/213.patch ** Base sha: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: 62f1037bdb0ffd5482e47209bfdbf7d820204116 **/ configure.ac | 2 ++ include/Makefile.am | 73 +++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 67 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 3209ade8b..e5bbccb31 100644 --- a/configure.ac +++ b/configure.ac @@ -219,6 +219,8 @@ AM_CONDITIONAL([ARCH_IS_AARCH64], [test "x${ARCH_DIR}" = "xaarch64"]) AM_CONDITIONAL([ARCH_IS_MIPS64], [test "x${ARCH_DIR}" = "xmips64"]) AM_CONDITIONAL([ARCH_IS_POWERPC], [test "x${ARCH_DIR}" = "xpowerpc"]) AM_CONDITIONAL([ARCH_IS_X86], [test "x${ARCH_DIR}" = "xx86"]) +AM_CONDITIONAL([ARCH_IS_X86_32], [test "x${ARCH_ABI}" = "xx86_32-linux"]) +AM_CONDITIONAL([ARCH_IS_X86_64], [test "x${ARCH_ABI}" = "xx86_64-linux"]) ########################################################################## # Setup doxygen documentation diff --git a/include/Makefile.am b/include/Makefile.am index 236c4c375..a3a7e1658 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -61,15 +61,72 @@ odpapiabidefaultinclude_HEADERS = \ odp/arch/default/api/abi/shared_memory.h odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi +if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ - odp/arch/@ARCH_ABI@/odp/api/abi/buffer.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/classification.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/crypto.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/event.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/packet.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/pool.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/queue.h \ - odp/arch/@ARCH_ABI@/odp/api/abi/shared_memory.h + odp/arch/arm32-linux/odp/api/abi/buffer.h \ + odp/arch/arm32-linux/odp/api/abi/classification.h \ + odp/arch/arm32-linux/odp/api/abi/crypto.h \ + odp/arch/arm32-linux/odp/api/abi/event.h \ + odp/arch/arm32-linux/odp/api/abi/packet.h \ + odp/arch/arm32-linux/odp/api/abi/pool.h \ + odp/arch/arm32-linux/odp/api/abi/queue.h \ + odp/arch/arm32-linux/odp/api/abi/shared_memory.h +endif +if ARCH_IS_AARCH64 +odpapiabiarchinclude_HEADERS = \ + odp/arch/arm64-linux/odp/api/abi/buffer.h \ + odp/arch/arm64-linux/odp/api/abi/classification.h \ + odp/arch/arm64-linux/odp/api/abi/crypto.h \ + odp/arch/arm64-linux/odp/api/abi/event.h \ + odp/arch/arm64-linux/odp/api/abi/packet.h \ + odp/arch/arm64-linux/odp/api/abi/pool.h \ + odp/arch/arm64-linux/odp/api/abi/queue.h \ + odp/arch/arm64-linux/odp/api/abi/shared_memory.h +endif +if ARCH_IS_MIPS64 +odpapiabiarchinclude_HEADERS = \ + odp/arch/mips64-linux/odp/api/abi/buffer.h \ + odp/arch/mips64-linux/odp/api/abi/classification.h \ + odp/arch/mips64-linux/odp/api/abi/crypto.h \ + odp/arch/mips64-linux/odp/api/abi/event.h \ + odp/arch/mips64-linux/odp/api/abi/packet.h \ + odp/arch/mips64-linux/odp/api/abi/pool.h \ + odp/arch/mips64-linux/odp/api/abi/queue.h \ + odp/arch/mips64-linux/odp/api/abi/shared_memory.h +endif +if ARCH_IS_POWERPC +odpapiabiarchinclude_HEADERS = \ + odp/arch/power64-linux/odp/api/abi/buffer.h \ + odp/arch/power64-linux/odp/api/abi/classification.h \ + odp/arch/power64-linux/odp/api/abi/crypto.h \ + odp/arch/power64-linux/odp/api/abi/event.h \ + odp/arch/power64-linux/odp/api/abi/packet.h \ + odp/arch/power64-linux/odp/api/abi/pool.h \ + odp/arch/power64-linux/odp/api/abi/queue.h \ + odp/arch/power64-linux/odp/api/abi/shared_memory.h +endif +if ARCH_IS_X86_32 +odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_32-linux/odp/api/abi/buffer.h \ + odp/arch/x86_32-linux/odp/api/abi/classification.h \ + odp/arch/x86_32-linux/odp/api/abi/crypto.h \ + odp/arch/x86_32-linux/odp/api/abi/event.h \ + odp/arch/x86_32-linux/odp/api/abi/packet.h \ + odp/arch/x86_32-linux/odp/api/abi/pool.h \ + odp/arch/x86_32-linux/odp/api/abi/queue.h \ + odp/arch/x86_32-linux/odp/api/abi/shared_memory.h +endif +if ARCH_IS_X86_64 +odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_64-linux/odp/api/abi/buffer.h \ + odp/arch/x86_64-linux/odp/api/abi/classification.h \ + odp/arch/x86_64-linux/odp/api/abi/crypto.h \ + odp/arch/x86_64-linux/odp/api/abi/event.h \ + odp/arch/x86_64-linux/odp/api/abi/packet.h \ + odp/arch/x86_64-linux/odp/api/abi/pool.h \ + odp/arch/x86_64-linux/odp/api/abi/queue.h \ + odp/arch/x86_64-linux/odp/api/abi/shared_memory.h +endif # Create symlink for ABI header files. Application does not need to use the arch # specific include path for installed files.