From patchwork Thu Oct 5 10:00:13 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: 114885 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp67840edb; Thu, 5 Oct 2017 03:27:47 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD+BHIg7BTN9VvKVi+4W7ZHVmbJ9Yk4aR3V+3IS1aB9w2AiMS0PwwsdUUVWVp3d2zZD/UYK X-Received: by 10.200.6.13 with SMTP id d13mr23852562qth.217.1507199266797; Thu, 05 Oct 2017 03:27:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507199266; cv=none; d=google.com; s=arc-20160816; b=KR+JDmMxh5+db8qq3CkBYrbo2HXNfAlrTCyMy7kq6xasRSMSsKpFeG28Pp7A4Vzjh2 7K1FDENEf+bbVHhIFrB36kK6f4JE7ex8Do98IkTIaRfNyzVMlVdG5uqW2OQC2VzvvxZH gJEUU7bMmYcS3jV0V2epn2UHAgfjYu65W2Qc4CXJGlkfRKWsks+Jup1VyIu0rBY88KR+ /zpAFK4xSOoM2HBKSQpoMOCMWSmKiUVcQ4NjXn2rL2cTw//JJOLFlYcAsGONcCL5cP+8 VZkAPJ05jF7I96l9OFEtiHmgHhWQXQcaVewwJeSEmFV7aNqAyoYFfrAqhFZCInub0usJ vweQ== 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=yUqcgnOFipMeKRtikuvNPQpjx2KoNFasXwuZcK+CBHM=; b=j4iKMoYsuk34hg5MmdvcC4gPV2Dvy+YvdSCthUSTh1mXy1clzxju12OUWmjJ/v0x8X 6dWY6M/jrahpJ8nRKA/j6mBSfmWh15UrJZ8IUj8oPqITX0/2agarTC3vQDqr59HMHvMA tVqt74XjjH2D1mMxgDwDL8gxFfzndS+UnX57/tckAHUfZEbjHYy+OZVhg5MfsUfQl//7 75mBJmb/9Yw2neI87BtQgkDHiF7z+le8zwrY+8d3xrx0EOgEYy6/48aVJYxH992wS3mK 5tmrlUdBpqk+03hZrIwM8pbAmkZvN9ySIApGIGY4nIjErpek3K97FugoVMHlm1ZH4Jx3 nOSQ== 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 5si837630qtq.459.2017.10.05.03.27.46; Thu, 05 Oct 2017 03:27:46 -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 662D165BB8; Thu, 5 Oct 2017 10:27:46 +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 58C28644B1; Thu, 5 Oct 2017 10:04:49 +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 E8DA6644B7; Thu, 5 Oct 2017 10:04:41 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id 5CC86644B7 for ; Thu, 5 Oct 2017 10:00:52 +0000 (UTC) Received: from mxback2g.mail.yandex.net (mxback2g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:163]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 5B7A713430E8 for ; Thu, 5 Oct 2017 13:00:51 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback2g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id DFEPjok6Pi-0p5WVWvV; Thu, 05 Oct 2017 13:00:51 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id DGg9opEbVV-0oqiRhU8; Thu, 05 Oct 2017 13:00:50 +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 13:00:13 +0300 Message-Id: <1507197617-6215-17-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> References: <1507197617-6215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v2 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: f77d26100249d410e863b9db7a1a41fdad922e03 **/ 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.