From patchwork Wed Jan 3 02:59:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123267 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9677239qgn; Tue, 2 Jan 2018 19:01:17 -0800 (PST) X-Google-Smtp-Source: ACJfBosZsuKM+GEdDqF/X63+/b96+3MHNqcPA/ubOtTSuZ7u8giOT7lK/T/emCPeqGw0n2aFNilh X-Received: by 10.55.189.2 with SMTP id n2mr94420qkf.155.1514948477490; Tue, 02 Jan 2018 19:01:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514948477; cv=none; d=google.com; s=arc-20160816; b=A+XIrmP9du7AuIeZiv+S8QYiavDb5QatjnkzqRdMnJYxuiK29kEN2bli0b7Myy7jtM M0amIVBreJuocPfyCKLw/8XrQyZcKxtthlTTMPEPJDympQjX6eldIVukrZt7DxuTqcw9 PSHlnqv3k0cqWuKgrkMwytQMFcFTv3QcCpfqMqlPxQW8y/e5Z5X/xgtgqDzjGLXsjSl/ Q+qVEbG4fhsM0nwp5NIZWc7WhUTL6MVoMgJNqBTyId7cy7xEMDffPlGAiJ+e/fTC1GiG 6UaC1hZ9DloFVFjUmgpImiK0ttUXKuxsD+cjQ/5SZXYjeVFHTIo3nWFqCk5ey4yAfWec Kitg== 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=paM6qydrOBXtmNk+UbOvE9S6aVMA7jhIXLO1rYDFVzU=; b=lEBYB+ytih30DIRiOWvFxIVKdAuYPMi7/z6hNNepxYJP+oSvHvqNJsdCRi70ecA0TF MMEO0EqiV6GHbsad5ZxgJEc4FRBljVOLjqnnyHrf0ksQtieQtA5T+8OZj61RMTIKiGay gH0UGaF7J0OXOKoaxYlW1ojPlSf1QMcnQJqrwY1f1a5heNKfaYf4SzopAsv9+h1guxeF UvasbBZLb9Xb3zxR1TrS10WPxKoVzeYzy/+8KRHj8ES41pAUdGrKIg3xJUIsdntu8prA bSV2/5g1+11RZHJPVvzuMhGeYrFv/y7i7l8ppPVXJLyAvcl5i+9N+oGXanl7y8g409TK lP1Q== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 o123si72022qkc.114.2018.01.02.19.01.17; Tue, 02 Jan 2018 19:01:17 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 2EA0760B0E; Wed, 3 Jan 2018 03:01:17 +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.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, 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 79977608E8; Wed, 3 Jan 2018 03:00:22 +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 AAA7160846; Wed, 3 Jan 2018 03:00:13 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id 3EFFB607BA for ; Wed, 3 Jan 2018 03:00:12 +0000 (UTC) Received: from mxback3o.mail.yandex.net (mxback3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1d]) by forward100o.mail.yandex.net (Yandex) with ESMTP id C44492A21E19 for ; Wed, 3 Jan 2018 06:00:10 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback3o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id iIdyenWqwt-0Aoe1ZLA; Wed, 03 Jan 2018 06:00:10 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0AZmnk6t; Wed, 03 Jan 2018 06:00:10 +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: Wed, 3 Jan 2018 05:59:55 +0300 Message-Id: <1514948409-30862-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 1/15] helper: link against libpthread and libodp-linux 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 libodphelper.so uses symbols from libpthread and libodp-linux.so, link it aganst those libraries. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ helper/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/helper/Makefile.am b/helper/Makefile.am index ee1c17d6d..ebb67346c 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include +AM_CFLAGS = $(PTHREAD_CFLAGS) AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)' @@ -60,4 +61,6 @@ __LIB__libodphelper_la_SOURCES += \ linux/thread.c endif +__LIB__libodphelper_la_LIBADD = $(PTHREAD_LIBS) $(LIB)/libodp-linux.la + lib_LTLIBRARIES = $(LIB)/libodphelper.la From patchwork Wed Jan 3 02:59:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123268 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9678274qgn; Tue, 2 Jan 2018 19:02:32 -0800 (PST) X-Google-Smtp-Source: ACJfBosjK+249kfj63ScUAKQZIKa7hmkG0NtEXW5nymLf7WlO8AXQaTi54r5S8DQ3kNq6yZhV4AA X-Received: by 10.55.136.133 with SMTP id k127mr118059qkd.150.1514948552203; Tue, 02 Jan 2018 19:02:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514948552; cv=none; d=google.com; s=arc-20160816; b=P1DtJ5hd22IgS5Ss/M3+wUbQrwv9dk/406I0bfcbekPghGdCDexjy8WhJm0alxkIW5 pBVAa2huJ/+WLdRyD0EpqksurPJhkr1J1/rQarSGwUDYyzDh8Kxm7y3RsYuXsW0k14sW f44dcEdaLSFNVh+aJo3X/V3I7f65IOLDXVXb4xpyzDrLuWdk/4xn4/SFVNu9UekD5jEM n2sJMUFqDzsEJ5GWFjyNgvyOrSE4osQin5Ae4HM4q6SR+Kcz5RW0qg6XZ3u8OdahOAL9 ek3XE7/DJ37toXu09w4il3Xkzb4MHCsqRcKRS+owx9PBaz/2MIYAKa2nP+xXtfZ879kx S/vg== 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=IiPj8sgeT0fhrhcIm8tmowP60GtafOtLSuNkvj92mw0=; b=UrhfBVgFtRimRhNE1NES2HaCrwOAadreQkPVzDSpJBbOxpNgGNr5KIKbQXznJVjlnF h9AlFnatZCT0l8M5jti5wyxRml8LX92LEkSDFQDeiqd8Z/cY+1VlnrWQVweHRXSBlX7E fBw0hym+HzNYiQZHmAOrZpS8eMIt487lvCO1gawCH9zLWMBiGObgYl/Zh2jTiWEnWj32 hGJ0I+0opPX2663KSf5LmLlD6Z4VJ5rgw4JRDBe7dXbw22OiW3u6ou+bjAfRuOw8pV2g yTqizTQEx/6TXDjBSlI2g9O0PzR483Xh6Ia6z7nRYuZQ0LMkcn1lC5fJ7ObcWYSwJMCW IeHg== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 f7si74045qte.58.2018.01.02.19.02.31; Tue, 02 Jan 2018 19:02:32 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id D649F608F7; Wed, 3 Jan 2018 03:02:31 +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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 D8E856087F; Wed, 3 Jan 2018 03:00:25 +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 BAA8B608E2; Wed, 3 Jan 2018 03:00:16 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id D86E4607E4 for ; Wed, 3 Jan 2018 03:00:12 +0000 (UTC) Received: from mxback3g.mail.yandex.net (mxback3g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:164]) by forward101j.mail.yandex.net (Yandex) with ESMTP id 60C981242DA6 for ; Wed, 3 Jan 2018 06:00:11 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback3g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id tL5CVxGaq7-0Bb82G4F; Wed, 03 Jan 2018 06:00:11 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0AZ4LckX; Wed, 03 Jan 2018 06:00:10 +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: Wed, 3 Jan 2018 05:59:56 +0300 Message-Id: <1514948409-30862-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 2/15] doc: add missing user-guide images to Makefile.am 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 Omitting those images in Makefile.am made them disappear from distribution tarball resulting in an improperly-built documentation files. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ doc/users-guide/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index b2ebd4d4f..7be32ddc1 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -32,6 +32,12 @@ IMAGES = $(IMAGES_DIR)/overview.svg \ $(IMAGES_DIR)/pktio_fsm.svg \ $(IMAGES_DIR)/pktout_direct_send.svg \ $(IMAGES_DIR)/pktout_queue_send.svg \ + $(IMAGES_DIR)/ref.svg \ + $(IMAGES_DIR)/refpkt1.svg \ + $(IMAGES_DIR)/refpkt2.svg \ + $(IMAGES_DIR)/refpktmulti.svg \ + $(IMAGES_DIR)/refpktsingle.svg \ + $(IMAGES_DIR)/refstatic.svg \ $(IMAGES_DIR)/release_git.svg \ $(IMAGES_DIR)/segment.svg \ $(IMAGES_DIR)/simple_release_git.svg \ From patchwork Wed Jan 3 02:59:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123270 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9679499qgn; Tue, 2 Jan 2018 19:04:17 -0800 (PST) X-Google-Smtp-Source: ACJfBosu3ZVCn31cCWf67Uxr/AJKffMvhrZC+8MhquvUuw93FiNoiDCYbH35/ldRzdHIqHMTBkbq X-Received: by 10.200.45.215 with SMTP id q23mr114455qta.57.1514948657462; Tue, 02 Jan 2018 19:04:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514948657; cv=none; d=google.com; s=arc-20160816; b=AISp8Sb1W7KjiAj9C/iihYAjWYqaqp6MxoVokk5yqBFDVhhl83k1yywzAxSIFkv9TH R9eCyTKE7ezRAbe8DjD9tI1ut7ftSIhBMvmc0pjucN9j/pbVJiXSDVJvDOtzXwqUJUqW YaXjINzjtulreOPmSNZmxL/nUTsTtQqK+IRSnQKkEiEFOTi5nFb0s6HGm5Nxx44VT9XX KLh8IM6h6RzwQRarIGhJAXPj3Ug3iiEnP7JDI+a3quwJUZRvHdq6Ur8nQ4ddq3ea5Ldv +FB09AGcG61ybK2UVGBghYOvAsCW1TjlODUGbpthcO5Byc2zxgPK5RO+yrOeEG8r7gE9 QHNg== 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=iige9U7qmOU1vMuXludZefy1INSZr3sqdi5y4khMOsQ=; b=qZzYRz8Je+nk+8XTfOMGQD5AlGtpq7VSUmhMdCix0GZrJ/tnTrTuo/pPxGFi6ogupg 3qmxGovjEhemdPSgX7gRA100RNJZHhi9vusxsOqpqbmldym7MaC/vFct+66rCTF7xNhX NRDBrb904oYbpT5utyIO7NqIjlwAhdnXM5uZYL8CimsUp+35cWl3vXYKlRseah4Lb1Ty 4dZ41S+XKvBG0fyMxvDOtl/9dTI8L2LpE+eKuGsoCVB0WokIsSmY5SWg61lKq9zxOtce pAfSaO10A6LqQ2O+h4vnaic0JMeLjM0sJMohMQDbJYmbPvn07Ehtq500LuQ0a881v2lS 7OZQ== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 h67si65838qkd.356.2018.01.02.19.04.17; Tue, 02 Jan 2018 19:04:17 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 307A860907; Wed, 3 Jan 2018 03:04:17 +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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 83E8A60912; Wed, 3 Jan 2018 03:00:34 +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 3B360608EC; Wed, 3 Jan 2018 03:00:19 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 4B848606F2 for ; Wed, 3 Jan 2018 03:00:13 +0000 (UTC) Received: from mxback2o.mail.yandex.net (mxback2o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1c]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 05AF01820AD for ; Wed, 3 Jan 2018 06:00:12 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback2o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id hH6gW81mPj-0B40kCYd; Wed, 03 Jan 2018 06:00:11 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0BZmHmN4; Wed, 03 Jan 2018 06:00:11 +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: Wed, 3 Jan 2018 05:59:57 +0300 Message-Id: <1514948409-30862-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 3/15] doc: add missing implementers-guide images to Makefile.am 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 Omitting those images in Makefile.am made them disappear from distribution tarball resulting in an improperly-built documentation files. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ doc/implementers-guide/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am index 07ee141c8..c407339e2 100644 --- a/doc/implementers-guide/Makefile.am +++ b/doc/implementers-guide/Makefile.am @@ -2,10 +2,12 @@ include ../Makefile.inc SRC = implementers-guide.adoc TARGET = implementers-guide.html +IMAGES = $(IMAGES_DIR)/abi_llvm.svg \ + $(IMAGES_DIR)/abi_traditional.svg -EXTRA_DIST = $(SRC) +EXTRA_DIST = $(SRC) $(IMAGES) doc_DATA = $(TARGET) -$(TARGET): $(SRC) +$(TARGET): $(SRC) $(IMAGES) CLEANFILES = $(doc_DATA) From patchwork Wed Jan 3 02:59:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123269 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9678928qgn; Tue, 2 Jan 2018 19:03:27 -0800 (PST) X-Google-Smtp-Source: ACJfBovfHsSNstOeWwr83n5ZvYC716JVUnlq6zVCpfL+2lQINd8DMbKmYvbayT+3AxjA8CfQU42H X-Received: by 10.200.8.56 with SMTP id u53mr114318qth.85.1514948607129; Tue, 02 Jan 2018 19:03:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514948607; cv=none; d=google.com; s=arc-20160816; b=iKZl/i9Lmoo0hpYqt0v1HUdfrbbvEyVvzka6yvHKIIMVxBpGDrtCISNXl1I87LreeF pO127T1bFSWcKgUQnPIGW0ybXxCXnLdtaflBA3ONsvhRhpW6TmSXtfg6gBP2NxSVxyRp UcnsH0eiFD5X/JurNhjLuHpZRXDgRZCEHYKOeGWc8hkU3K9UUINKqFw5/FrLsFEqxIKu c8QprhjVRBg3QdXTdvwsgZbuIMGbnr7py5Q1nkz0u+kbVlXxAt/eQlAwVOQjRpaiNhTl KK6srvl07HMeD5VruxdcISo+O8QTE23D6lxEn6UAp5SaNp1ro+qqOIiN0gKUn2yuAX7s E63Q== 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=aCISPKpiYp3MQWeTY4ak748drMAByLej14uyxOZnuWc=; b=AzrOKAyLvexWFcQrLFKK/3gxSo8wGuSd8hNQ1esgVq0MzafeCA43cdF/ogdGZTX6SB 6r/XwkXfqZbUimu5miSYJR61GbDUCislQLDQBhsI7hOfb5ulBCGbP5C3rzDyXpIoSZ6R IxMMjdX8oa7/y90luRrxDdjJjLyy0N6/Yfc82o5SIRJaOLlbtMdbgdGTIMA4azascaa+ jLC6CwQWVAzvSkhGWpytl1Pt49zI0tQ+xpJSIHa2sPXk4m42QGNjHAtKAsEb5WaWu60t nYxnG6nARzT7J2m7khN9ZO/W/OMDefd2hlIbuUzvOG8ESay6pYc1PqlaKcCgeSXjFiK3 QUOw== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 r35si85666qkh.82.2018.01.02.19.03.26; Tue, 02 Jan 2018 19:03:27 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id DB36960928; Wed, 3 Jan 2018 03:03:26 +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, RCVD_IN_MSPIKE_H2, 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 3A23D60940; Wed, 3 Jan 2018 03:00:30 +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 BA1EE608EC; Wed, 3 Jan 2018 03:00:18 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id ED5E2607BA for ; Wed, 3 Jan 2018 03:00:13 +0000 (UTC) Received: from mxback20j.mail.yandex.net (mxback20j.mail.yandex.net [IPv6:2a02:6b8:0:1619::114]) by forward104j.mail.yandex.net (Yandex) with ESMTP id 9D46F42C52 for ; Wed, 3 Jan 2018 06:00:12 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback20j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id F5cHUf2U4v-0Crudafd; Wed, 03 Jan 2018 06:00:12 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0CZemIIF; Wed, 03 Jan 2018 06:00:12 +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: Wed, 3 Jan 2018 05:59:58 +0300 Message-Id: <1514948409-30862-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 4/15] performance: odp_crypto: correct typo 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 Receieved -> Received. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ test/performance/odp_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c index 0cbc2754e..761cc8cff 100644 --- a/test/performance/odp_crypto.c +++ b/test/performance/odp_crypto.c @@ -612,7 +612,7 @@ run_measure_one(crypto_args_t *cargs, if (cargs->debug_packets) { mem = odp_packet_data(out_pkt); - print_mem("Receieved encrypted packet", + print_mem("Received encrypted packet", mem, payload_length + config-> From patchwork Wed Jan 3 02:59:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123271 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9680222qgn; Tue, 2 Jan 2018 19:05:13 -0800 (PST) X-Google-Smtp-Source: ACJfBovaTtuKPD8tlDaQtYloiQMm+dueXTPBvr1QoygnyCmVmnh9VPq4kr9s1eSgdSJBAWbGif3D X-Received: by 10.200.45.89 with SMTP id o25mr97088qta.227.1514948713110; Tue, 02 Jan 2018 19:05:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514948713; cv=none; d=google.com; s=arc-20160816; b=DeIuuuf0VJMr5Omn9mBYt1hBxzl7bBb4RqrAvTT7+/Ct52gaMfcjKw7Vb3wjhsXf70 jMnC6mq7AzoNvQ3wF2kdwjDUrPvYWhSuVOgHLFWfiqjUzBvca06WCd0AxS/Nqxp7HTZ4 0sktpzOdunoh5ius3iOmOy+FSdqZZ/iHU40PY4uLPpMOWE1cuBU7woQKtHvbKQOqP/rD toQk0OmMR2IgetIHZ8Pl4YDfTh9kBVfh1ci/q2vFwNQFNf2SZ9YqGmlfhOGqT7ZIam/I 9YdcZUZDhiQrDbojMCUT1yXaPZbPohAi8YkWkj8lOvOZLftThEszQDmAuO8LIusvzO7r 5JVQ== 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=4XfMReZwTAbOaO1nVoLOQFZ21nv48jkH0VNwkZlfPt0=; b=nV1UrA8TvSEuz5pNiFWUf6Dzhr1OB9B9vocaH3P/98kgytrL6A/s5rJv6WcDF54ijk XKry8iRJ16eV13tWIBr69aTUic8OE3sWDx169zczQYhDOayLRmExCpS780cCSfL5wnTN t8kSNwXVkmsB0vwktd8wAQE5ltIKjgEyvzy5D1wJe/itpD2Yt/lhJ28AzBfimM0v7EkE zgnwhVKEFtVfDmV6oIhXq5HkJ8nG0LDWVDGSELyhOkHrJ1uJnjreNTLY7VMN92zM3fJz XaFuIw+CMeC8x5JiSWVY5pJOzHn0aduMy5KI0EcDmvo/1BTNFMvzkse7GJ3CVCEcP5Ct fOOQ== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 b30si67721qtc.248.2018.01.02.19.05.12; Tue, 02 Jan 2018 19:05:13 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id C1EAA60928; Wed, 3 Jan 2018 03:05:12 +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, RCVD_IN_MSPIKE_H2, 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 C3B5B60975; Wed, 3 Jan 2018 03: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 A673A608EC; Wed, 3 Jan 2018 03:00:20 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id 64F70607FE for ; Wed, 3 Jan 2018 03:00:14 +0000 (UTC) Received: from mxback10g.mail.yandex.net (mxback10g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:171]) by forward102o.mail.yandex.net (Yandex) with ESMTP id 2C9A15A0232C for ; Wed, 3 Jan 2018 06:00:13 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback10g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id zldpXdVoih-0Dx4aptW; Wed, 03 Jan 2018 06:00:13 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0CZacInp; Wed, 03 Jan 2018 06:00:12 +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: Wed, 3 Jan 2018 05:59:59 +0300 Message-Id: <1514948409-30862-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 5/15] build: provide an option to link examples dynamically 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 Distributions won't like statically-linked binaries. Provide configure switch to link examples and tests dynamically. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ configure.ac | 11 +++++++++++ example/Makefile.inc | 4 ++++ test/Makefile.inc | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/configure.ac b/configure.ac index 177881a58..3242c453c 100644 --- a/configure.ac +++ b/configure.ac @@ -172,6 +172,16 @@ AS_IF([test "${with_platform}" = "linux-generic"], AC_DEFINE_UNQUOTED([IMPLEMENTATION_NAME], ["$IMPLEMENTATION_NAME"], [Define to the name of the implementation]) +########################################################################## +# Build examples/tests dynamically +########################################################################## +AC_ARG_ENABLE([static-tests], + [AS_HELP_STRING([--disable-static-tests], + [disable static linking of examples and tests] + [ with ODP])], [], + [enable_static_tests=yes]) +AM_CONDITIONAL([STATIC_LINK], [test "x$enable_static_tests" != "xno"]) + ########################################################################## # Include m4 files ########################################################################## @@ -383,6 +393,7 @@ AC_MSG_RESULT([ Deprecated APIs: ${deprecated} debug: ${enable_debug} cunit: ${cunit_support} + static tests linkage: ${enable_static_tests} test_vald: ${test_vald} test_perf: ${test_perf} test_perf_proc: ${test_perf_proc} diff --git a/example/Makefile.inc b/example/Makefile.inc index 1609066e6..4cf5cfacc 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -13,4 +13,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include +if STATIC_LINK AM_LDFLAGS = -L$(LIB) -static +else +AM_LDFLAGS = +endif diff --git a/test/Makefile.inc b/test/Makefile.inc index f7c0da214..d7e435038 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -18,7 +18,11 @@ INCFLAGS = \ AM_CPPFLAGS = $(INCFLAGS) AM_CFLAGS = $(CUNIT_CFLAGS) +if STATIC_LINK AM_LDFLAGS = -L$(LIB) -static +else +AM_LDFLAGS = +endif @VALGRIND_CHECK_RULES@ From patchwork Wed Jan 3 03:00:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123272 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9681171qgn; Tue, 2 Jan 2018 19:06:18 -0800 (PST) X-Google-Smtp-Source: ACJfBovoo/ZA5z04DF18BPUEUg2WcLfu1pEflFfhXbznlqUAN1XTK6Qi+Rz5wS/WoNIsU7e58r4l X-Received: by 10.200.39.48 with SMTP id g45mr100197qtg.313.1514948778028; Tue, 02 Jan 2018 19:06:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514948778; cv=none; d=google.com; s=arc-20160816; b=wNJ6qAd0yZC9N2+knCr4psr45IMmRCG6PYp3H1PQ8c+2yKOh6g/5vK8Xjirm5NdAMw bLymEBCe5ereDmwGatDIocl20rGsCLfMF/3Gd0ZXcvdCNq8wsuNCpeZo0Oj0AE3G5rBz DJdaOFVWvXsdmIfx+vOrnl1Shd8g2TBEcm35UoGBiMQyPgoEio4lVVV2uwlPErmiF/o9 BJJq8PB5Pl33Vjc8M0yXJyBdltBCeZ5aVB6WMQrNXOy6SFd7STsVx9MGH0+26aIhv0Ds Rh2dcoLBwYuOkJJahoWQRy+z+PRZg8zGsvo94WDofV+hd6t+A8ruWPhxgg6+VqGcWCEu kI5w== 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=Oakgi8cDwCjIfRPsqjjNopywOFEMYeCV7wN3LyQSCIE=; b=G3q5Vje78ggjJ6SxPBUTI++nWSsV/GT4pPTi43n17RUDysSDpz2CG/KQiHHKe7QD/b 5gCQcm2ALgHC9dFpFQ0Qfh1EGIrFR4cnjpI3MQfKv1pWBljqJpf99ZX7q71jBHthFHf2 zhmTsLG1stpSLqM/QOr9AaAc5R4oGpPFwTZlTgEpyoSWbbT7jDZu/04+aHsNuoYgRDVE XW+1hsNvBM14f+ZaSC7xqRFlLCzqL/GTRqSeGkNcjaEs00BMkJ4drTMsfUx0oieDk8t1 pquuOxWd2CrvjHRvOEP2P4LzXnC/rRs81ny7GU7mvF7XYSctQoOrfX7+F+atxzNv4AqX R5rg== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 e44si84181qtf.10.2018.01.02.19.06.17; Tue, 02 Jan 2018 19:06:18 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 8A7E461522; Wed, 3 Jan 2018 03:06:17 +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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 1C79D60903; Wed, 3 Jan 2018 03:00: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 BD0FD608FA; Wed, 3 Jan 2018 03:00:22 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id DD2D260848 for ; Wed, 3 Jan 2018 03:00:14 +0000 (UTC) Received: from mxback10o.mail.yandex.net (mxback10o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::24]) by forward106j.mail.yandex.net (Yandex) with ESMTP id B8CCC1800ED0 for ; Wed, 3 Jan 2018 06:00:13 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback10o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 2Tbn7s7LEc-0D0KPGQP; Wed, 03 Jan 2018 06:00:13 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0DZ4VKJ3; Wed, 03 Jan 2018 06:00:13 +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: Wed, 3 Jan 2018 06:00:00 +0300 Message-Id: <1514948409-30862-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 6/15] linux-gen: don't pass DPKD_LIBS for dynamic linking with libodp-linux 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 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ platform/linux-generic/libodp-linux.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/linux-generic/libodp-linux.pc.in b/platform/linux-generic/libodp-linux.pc.in index 220dbc9c6..962a4f78f 100644 --- a/platform/linux-generic/libodp-linux.pc.in +++ b/platform/linux-generic/libodp-linux.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: libodp-linux Description: The ODP packet processing engine Version: @PKGCONFIG_VERSION@ -Libs: -L${libdir} -lodp-linux @DPDK_LIBS@ +Libs: -L${libdir} -lodp-linux Libs.private: @OPENSSL_STATIC_LIBS@ @DPDK_PMDS@ @DPDK_LIBS@ @PCAP_LIBS@ @PTHREAD_LIBS@ @TIMER_LIBS@ -lpthread @ATOMIC_LIBS@ Cflags: -I${includedir} From patchwork Wed Jan 3 03:00:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123273 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9681753qgn; Tue, 2 Jan 2018 19:07:09 -0800 (PST) X-Google-Smtp-Source: ACJfBovvtObbYE3dSdq1jrB0kCfw15d7Qs1ChICK25fatrCqN7+MJgctecN1B+UzgEWM0l7pr2XC X-Received: by 10.233.232.208 with SMTP id a199mr134021qkg.264.1514948829370; Tue, 02 Jan 2018 19:07:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514948829; cv=none; d=google.com; s=arc-20160816; b=z+moNbWkHvHdFW2LQC/iyeAAQrxY77XU62BgGcFz2HeXrXKKIoWXOsSBfb711a5YE4 uB9PZyYfgF69BrYmAelWcO0UeSjkdNnrMN0gGYBLmsUQK7XvhX2H0Ghw/hzuwvpjV5lE UQ3WOedinuX9cy78+dXKAqrkLPGy9ipJ6Whvj22kZYFJjPbHYFFKNhlYhhrl/sifu5Y+ VAL7FSzKj7MVPdfUFpR3B1jeaoP405DC2V/oKzX8e/qP0CRWTeqst/hYtoBGrdjSSUjC sRS/OHpGzKmSZ8y6dRyMAMCPCvkDVCTDwESemnG9hmfP3H9MXZvzAvddQDxgQx083sgm 7cRQ== 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=4xU8nVyKH7npo/pPocpNG3K+pAGELCbupt5C1A2FpWw=; b=vZpi/gX41vXWuEowK8alLffA8E9xFfwqwTbThibKGVOHYU6yGjtV2sc/Wf/cUW2Q+j 4yFt+05x7sWWepsYgzwMyHNfbWFo0OFc49T+R9+Tp2TCIV+Sulz+o7DsSb+DptXoUz9P RQq4RZShuPuBsTyxOoYl/eQaqFfl3niTw24LJBSiOz9NaTqZb0WXWKHYrK0z30SPQYEe qLegIVZlhU9rupaMfGtaJBpAR1sfm3i7jgI32SoGvBbmrn889fVjYnrWkodjTXQ0Yx0t BE8dXJWlhFLjnMPmBIbSsGtw7x8UZnE0zr45O52Eljd4otNqqC1qPCHaEywu/UG6nGn5 cQmw== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 i12si64174qta.375.2018.01.02.19.07.09; Tue, 02 Jan 2018 19:07:09 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 14BBE61525; Wed, 3 Jan 2018 03:07:09 +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.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, 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 70A19608D9; Wed, 3 Jan 2018 03:00:58 +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 CA375608F8; Wed, 3 Jan 2018 03:00:25 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 6B72C6084A for ; Wed, 3 Jan 2018 03:00:15 +0000 (UTC) Received: from mxback18j.mail.yandex.net (mxback18j.mail.yandex.net [IPv6:2a02:6b8:0:1619::94]) by forward101j.mail.yandex.net (Yandex) with ESMTP id 7B5921242DBB for ; Wed, 3 Jan 2018 06:00:14 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback18j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id y0cUioG1YB-0Eqaflp2; Wed, 03 Jan 2018 06:00:14 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0DZ4vLx2; Wed, 03 Jan 2018 06:00:13 +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: Wed, 3 Jan 2018 06:00:01 +0300 Message-Id: <1514948409-30862-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 7/15] linux-gen: dpdk: simplify linking with shared libdpdk 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 There is no need to pass PMDs when linking with shared DPDK library. Just pass -ldpdk which will pick up all PMDS dynamically. When linking with static DPKD library it is required to pass additional libraries after whole PMD string to fix linking when Libtool will reorder flags. So provide just two variables DPDK_LIBS and DPDK_LIBS_LT. Former should be passed directly to gcc, while later should be passed to libtool. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ example/Makefile.inc | 2 +- m4/odp_dpdk.m4 | 83 ++++++++++++++++++++++++------- platform/linux-generic/Makefile.am | 2 +- platform/linux-generic/libodp-linux.pc.in | 2 +- platform/linux-generic/m4/odp_dpdk.m4 | 24 +-------- platform/linux-generic/test/Makefile.inc | 2 +- test/Makefile.inc | 2 +- test/validation/api/Makefile.inc | 1 - 8 files changed, 73 insertions(+), 45 deletions(-) diff --git a/example/Makefile.inc b/example/Makefile.inc index 4cf5cfacc..829977ce8 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,7 +1,7 @@ TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} LIB = $(top_builddir)/lib -LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS) +LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_LIBS_LT) AM_CFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/example \ diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 05e60cc06..1887b0431 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -1,22 +1,38 @@ # ODP_DPDK_PMDS(DPDK_DRIVER_PATH) # ------------------------------- -# Build a list of DPDK PMD drivers in DPDK_PMDS variable +# Build a list of DPDK PMD drivers in DPDK_PMDS variable. +# Updated DPDK_LIBS to include dependencies. AC_DEFUN([ODP_DPDK_PMDS], [dnl -AS_VAR_SET([DPDK_PMDS], [-Wl,--whole-archive,]) +AS_VAR_SET([DPDK_PMDS], ["-Wl,--whole-archive,"]) for filename in "$1"/librte_pmd_*.a; do cur_driver=`basename "$filename" .a | sed -e 's/^lib//'` -# rte_pmd_nfp has external dependencies which break linking -if test "$cur_driver" = "rte_pmd_nfp"; then - echo "skip linking rte_pmd_nfp" -else - AS_VAR_APPEND([DPDK_PMDS], [-l$cur_driver,]) -fi +AS_VAR_APPEND([DPDK_PMDS], [-l$cur_driver,]) +AS_CASE([$cur_driver], + [rte_pmd_nfp], [AS_VAR_APPEND([DPDK_LIBS], [" -lm"])], + [rte_pmd_pcap], [AS_VAR_APPEND([DPDK_LIBS], [" -lpcap"])], + [rte_pmd_openssl], [AS_VAR_APPEND([DPDK_LIBS], [" -lcrypto"])]) done AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) -AC_SUBST([DPDK_PMDS]) ]) -# _ODP_DPDK_CHECK_LIB(LDFLAGS, [LIBS], [EXTRA_LIBS]) +# _ODP_DPDK_SET_LIBS +# -------------------- +# Set DPDK_LIBS/DPDK_LIBS_LT depending on DPDK setup +AC_DEFUN([_ODP_DPDK_SET_LIBS], [dnl +AS_IF([test "x$DPDK_SHARED" = "xyes"], [dnl + DPDK_LIBS_LT="" + DPDK_LIBS="$DPDK_LDFLAGS $DPDK_RPATH $DPDK_LIBS" +], [dnl + ODP_DPDK_PMDS([$DPDK_PMD_PATH]) + DPDK_LIBS_LT="`echo $DPDK_LIBS | sed -e 's/^/-Wc,/' -e 's/ /,/g'`" + DPDK_LIBS_LT="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS_LT $DPDK_LIBS" + DPDK_LIBS="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS" +]) +AC_SUBST([DPDK_LIBS]) +AC_SUBST([DPDK_LIBS_LT]) +]) + +# _ODP_DPDK_CHECK_LIB(LDFLAGS, [LIBS]) # ---------------------------------- # Check if one can use -ldpdk with provided set of libs AC_DEFUN([_ODP_DPDK_CHECK_LIB], [dnl @@ -31,7 +47,7 @@ LIBS="$LIBS -ldpdk $2" AC_MSG_CHECKING([for rte_eal_init in -ldpdk $2]) AC_LINK_IFELSE([AC_LANG_CALL([], [rte_eal_init])], [AC_MSG_RESULT([yes]) - DPDK_LIBS="$1 -ldpdk $3 $2"], + DPDK_LIBS="-ldpdk $2"], [AC_MSG_RESULT([no])]) ########################################################################## @@ -41,10 +57,10 @@ LDFLAGS=$OLD_LDFLAGS LIBS=$OLD_LIBS ]) -# ODP_DPDK_CHECK(CPPFLAGS, LDFLAGS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) -# ----------------------------------------------------------------------- +# _ODP_DPDK_CHECK(CPPFLAGS, LDFLAGS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) +# ------------------------------------------------------------------------ # Check for DPDK availability -AC_DEFUN([ODP_DPDK_CHECK], [dnl +AC_DEFUN([_ODP_DPDK_CHECK], [dnl ########################################################################## # Save and set temporary compilation flags ########################################################################## @@ -59,13 +75,14 @@ AC_CHECK_HEADERS([rte_config.h], [], DPDK_LIBS="" _ODP_DPDK_CHECK_LIB([$2]) AS_IF([test "x$DPDK_LIBS" = "x"], - [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread], [-lm])]) + [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread])]) AS_IF([test "x$DPDK_LIBS" = "x"], - [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread -lnuma], [-lm])]) + [_ODP_DPDK_CHECK_LIB([$2], [-ldl -lpthread -lnuma])]) AS_IF([test "x$DPDK_LIBS" = "x"], [dpdk_check_ok=no]) AS_IF([test "x$dpdk_check_ok" != "xno"], - [AC_SUBST([DPDK_LIBS]) + [_ODP_DPDK_SET_LIBS + AC_SUBST([DPDK_CPPFLAGS]) m4_default([$3], [:])], [m4_default([$4], [:])]) @@ -74,3 +91,35 @@ AS_IF([test "x$dpdk_check_ok" != "xno"], ########################################################################## CPPFLAGS=$OLD_CPPFLAGS ]) + +# ODP_DPDK(DPDK_PATH, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ----------------------------------------------------------------------- +# Check for DPDK availability +AC_DEFUN([ODP_DPDK], [dnl +AS_IF([test "x$1" = "xsystem"], [dnl + DPDK_CPPFLAGS="-isystem/usr/include/dpdk" + DPDK_LDFLAGS="" + DPDK_RPATH="" + DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.so`" + if test "x$DPDK_LIB_PATH" = "x" ; then + DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.a`" + else + DPDK_SHARED=yes + fi + AS_IF([test "x$DPDK_LIB_PATH" = "x"], + [AC_MSG_FAILURE([Could not locate system DPDK library directory])]) + DPDK_PMD_PATH=`AS_DIRNAME(["$DPDK_PMD_PATH"])` +], [dnl + DPDK_CPPFLAGS="-isystem $1/include" + DPDK_LIB_PATH="$1/lib" + DPDK_LDFLAGS="-L$DPDK_LIB_PATH" + DPDK_PMD_PATH="$DPDK_LIB_PATH" + if test -r "$DPDK_LIB_PATH"/libdpdk.so ; then + DPDK_RPATH="-R$DPDK_LIB_PATH" + DPDK_SHARED=yes + else + DPDK_RPATH= + fi +]) +_ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [$2], [$3]) +]) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7e40448bd..92ce2cce6 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -306,7 +306,7 @@ endif __LIB__libodp_linux_la_LIBADD = $(ATOMIC_LIBS) __LIB__libodp_linux_la_LIBADD += $(OPENSSL_LIBS) -__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS) $(DPDK_PMDS) +__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS_LT) __LIB__libodp_linux_la_LIBADD += $(PTHREAD_LIBS) __LIB__libodp_linux_la_LIBADD += $(TIMER_LIBS) diff --git a/platform/linux-generic/libodp-linux.pc.in b/platform/linux-generic/libodp-linux.pc.in index 962a4f78f..5125f83ad 100644 --- a/platform/linux-generic/libodp-linux.pc.in +++ b/platform/linux-generic/libodp-linux.pc.in @@ -7,5 +7,5 @@ Name: libodp-linux Description: The ODP packet processing engine Version: @PKGCONFIG_VERSION@ Libs: -L${libdir} -lodp-linux -Libs.private: @OPENSSL_STATIC_LIBS@ @DPDK_PMDS@ @DPDK_LIBS@ @PCAP_LIBS@ @PTHREAD_LIBS@ @TIMER_LIBS@ -lpthread @ATOMIC_LIBS@ +Libs.private: @OPENSSL_STATIC_LIBS@ @DPDK_LIBS@ @PCAP_LIBS@ @PTHREAD_LIBS@ @TIMER_LIBS@ -lpthread @ATOMIC_LIBS@ Cflags: -I${includedir} diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index 471bbcd51..b2193a168 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -13,17 +13,6 @@ AC_ARG_WITH([dpdk-path], [DPDK_PATH="$withval" pktio_dpdk_support=yes],[]) -AS_IF([test "x$DPDK_PATH" = "xsystem"], - [DPDK_CPPFLAGS="-isystem/usr/include/dpdk" - DPDK_LDFLAGS="" - DPDK_PMD_PATH="`$CC --print-file-name=librte_pmd_null.a`" - DPDK_PMD_PATH="`dirname "$DPDK_PMD_PATH"`" - AS_IF([test "x$DPDK_PMD_PATH" = "x"], - [AC_MSG_FAILURE([Could not locate system DPDK PMD directory])])], - [DPDK_CPPFLAGS="-isystem $DPDK_PATH/include" - DPDK_LDFLAGS="-L$DPDK_PATH/lib" - DPDK_PMD_PATH="$DPDK_PATH/lib"]) - ########################################################################## # Enable zero-copy DPDK pktio ########################################################################## @@ -42,22 +31,13 @@ AC_ARG_ENABLE([dpdk-zero-copy], ########################################################################## if test x$pktio_dpdk_support = xyes then - ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [], - [AC_MSG_FAILURE([can't find DPDK])]) - - ODP_DPDK_PMDS([$DPDK_PMD_PATH]) + ODP_DPDK([$DPDK_PATH], [], + [AC_MSG_FAILURE([can't find DPDK])]) AC_DEFINE([ODP_PKTIO_DPDK], [1], [Define to 1 to enable DPDK packet I/O support]) AC_DEFINE_UNQUOTED([ODP_DPDK_ZERO_COPY], [$zero_copy], [Define to 1 to enable DPDK zero copy support]) - - if test -r "$DPDK_PMD_PATH/librte_pmd_pcap.a" && - ! test -r "$DPDK_PMD_PATH/librte_pmd_pcap.so" ; then - DPDK_LIBS="$DPDK_LIBS -lpcap" - fi - AC_SUBST([DPDK_CPPFLAGS]) - AC_SUBST([DPDK_LIBS]) else pktio_dpdk_support=no fi diff --git a/platform/linux-generic/test/Makefile.inc b/platform/linux-generic/test/Makefile.inc index dd21917eb..419a63d1c 100644 --- a/platform/linux-generic/test/Makefile.inc +++ b/platform/linux-generic/test/Makefile.inc @@ -8,7 +8,7 @@ AM_CFLAGS = $(CUNIT_CFLAGS) LIBCUNIT_COMMON = $(top_builddir)/test/common/libcunit_common.la LIB = $(top_builddir)/lib -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS) +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_LIBS_LT) INCCUNIT_COMMON = -I$(top_srcdir)/test/common INCODP = \ diff --git a/test/Makefile.inc b/test/Makefile.inc index d7e435038..857de4512 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -3,7 +3,7 @@ LIB = $(top_builddir)/lib #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things #before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_PMDS) +LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_LIBS_LT) INCFLAGS = \ -I$(top_builddir)/platform/@with_platform@/include \ diff --git a/test/validation/api/Makefile.inc b/test/validation/api/Makefile.inc index 4af010002..6e66301be 100644 --- a/test/validation/api/Makefile.inc +++ b/test/validation/api/Makefile.inc @@ -3,7 +3,6 @@ include $(top_srcdir)/test/Makefile.inc COMMON_DIR = $(top_builddir)/test/common AM_CFLAGS += -I$(top_srcdir)/test/common -AM_LDFLAGS += $(DPDK_PMDS) AM_CFLAGS += $(CUNIT_CFLAGS) From patchwork Wed Jan 3 03:00:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123274 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9682737qgn; Tue, 2 Jan 2018 19:08:37 -0800 (PST) X-Google-Smtp-Source: ACJfBos8HTrbYI2j4rd+8XwPiGzui7QJHXn6uJerk/xKkd/f0bH3Iad0Uk6VZ4KtuzKWr95dqVmy X-Received: by 10.55.4.143 with SMTP id 137mr155632qke.28.1514948916912; Tue, 02 Jan 2018 19:08:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514948916; cv=none; d=google.com; s=arc-20160816; b=P4YsBiSgu6UUBzDSpMU/LwCfNMtkn+J17f9PDts8PQe58fE5/8kmzme7Pws3tOoEGY DHdwJ1aF8CZqK+RPc19sdwym4KKHo0q1VClRAJW8L5sNv2BSIgtpI5SNPpXb2s4o1yjh RPTu9l+D56y3JVMvikr2h7uflX7+YJBFhMTveOX1W9T2L8GnisNSJW1SHmDEnyFXPlG5 TrnM499G+CT0NdQ0R5ew8fBOF4p3fLBY05qlpwsxp6mNft58FiI96aLYyCf8/vWbT/Bt Mk4fnAmeFgSpOik1baqr+1587aHOn9s4h/C/S7nW7p9yCedyugctglqyoShfd0hdfHrd rzDg== 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=YOqBhAJ2KGrNdHz7ypFvFRY1mHnIwiYLNQ3P8dZJJC4=; b=WaOBcNNgol+LLN/Zc6ktE93egZTH/z8OY9/ocFA9fq2ZOdRNRauxlTAZJV4d1bdk15 ygSx/vCNnepD/N1FFwoVm9NHnEUUTbsctONFmtM9iNHqJ4xRTuHZOEwuglOvKWpwKYT7 ODwDYLVIbg+KLSL5KQayjGHq2cON3brwvcmTZwB0xw06VpbEgbUR1knXIHdysXoh75rt JR1MqYFCB39G6sD7N11n0D/gv899q9BP1at5BpbavQjBc2QtkgRTUIheDF7OlS586C+G b/JgcHZ/wLk8kiQJhwKrVM6RvVpxXzAQYzsBTIlmx8uCyHoZgNh7CE7zsE9ZdyPFzNzK 60pw== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 n24si84425qta.37.2018.01.02.19.08.36; Tue, 02 Jan 2018 19:08:36 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 9EDA3608FD; Wed, 3 Jan 2018 03:08:36 +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, RCVD_IN_MSPIKE_H2, 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 B4F92607E4; Wed, 3 Jan 2018 03:01:03 +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 EF13660961; Wed, 3 Jan 2018 03:00:48 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 810DA608B4 for ; Wed, 3 Jan 2018 03:00:16 +0000 (UTC) Received: from mxback13j.mail.yandex.net (mxback13j.mail.yandex.net [IPv6:2a02:6b8:0:1619::88]) by forward102p.mail.yandex.net (Yandex) with ESMTP id 073A44302D9E for ; Wed, 3 Jan 2018 06:00:15 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback13j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id UzOUJ5aBfs-0EtKYEaa; Wed, 03 Jan 2018 06:00:14 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0EZquTJf; Wed, 03 Jan 2018 06: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: Wed, 3 Jan 2018 06:00:02 +0300 Message-Id: <1514948409-30862-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 8/15] example: add missing libraries to LDADD variables 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 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ example/ipfragreass/Makefile.am | 2 ++ example/ipsec/Makefile.am | 1 + example/ipsec_api/Makefile.am | 3 +++ 3 files changed, 6 insertions(+) diff --git a/example/ipfragreass/Makefile.am b/example/ipfragreass/Makefile.am index fa7d5c8bd..b98e066f8 100644 --- a/example/ipfragreass/Makefile.am +++ b/example/ipfragreass/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/example/Makefile.inc +LDADD += $(ATOMIC_LIBS) + bin_PROGRAMS = odp_ipfragreass odp_ipfragreass_SOURCES = odp_ipfragreass.c \ diff --git a/example/ipsec/Makefile.am b/example/ipsec/Makefile.am index 85905ffa7..eba9b8bda 100644 --- a/example/ipsec/Makefile.am +++ b/example/ipsec/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/example/Makefile.inc AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) +LDADD += $(OPENSSL_LIBS) bin_PROGRAMS = odp_ipsec diff --git a/example/ipsec_api/Makefile.am b/example/ipsec_api/Makefile.am index 847326fc0..14bc5dd66 100644 --- a/example/ipsec_api/Makefile.am +++ b/example/ipsec_api/Makefile.am @@ -1,5 +1,8 @@ include $(top_srcdir)/example/Makefile.inc +AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) +LDADD += $(OPENSSL_LIBS) + bin_PROGRAMS = odp_ipsec dist_bin_SCRIPTS = \ From patchwork Wed Jan 3 03:00:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123275 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9683507qgn; Tue, 2 Jan 2018 19:09:39 -0800 (PST) X-Google-Smtp-Source: ACJfBot5riOBNwLSPKOG4UUWyBY0OWtygMIOIBYbNVv8WtGWepElT/kCfGh1Jirj89XFrxagKJhK X-Received: by 10.200.42.70 with SMTP id l6mr140205qtl.110.1514948979271; Tue, 02 Jan 2018 19:09:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514948979; cv=none; d=google.com; s=arc-20160816; b=ltuEHHd4lKP5D+FDHuW62+d4A91Wz/roUqj4+5eqbo2su1j/wRH/kJa3yu+8gUlW2R 1YWg0xriVzL2JF6X+tx4AKqDkaNd6vj4mReHGq6o6HVG+4fTbd+3Jio4Qhz47P1o84CQ dQ+ZXQzw23WNRBntsZ7MqgR8I9k6wKSLZCqpeHUFFsM+EiZPJtUBWIKTF/Fc7vsXVqMg syAegT8sc6LaW/ZQXFFZhRX8jvltR5+CDZFsRxeBRd8u7jCNkaOC+pRXgcEqzi2kymVZ o++Pb/cbLFeWMZdfORpUt4St7t7cWrCkIRx8Hyh/ppAIMqBsTeOvK9VtBHmKe4a0ptiw Js1Q== 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=p0OQIgXwGQcSix17wjqR5qx0s8ycTH/47zSSaMxeMeo=; b=PrhPBwwI5GwLOkGLK5e2diINRK0P2HXxGcT6EBe34QkwsjbNUdguSfm8/LT0udeJFo /HkuIqC1sYL/n7/3kJWQqFljBQ7UwwCN24DkDnMjMoGWaPkaVX5H06+UF5YJ8bFVUO0i 8efoGEwx3wvMC+nJSBVgUW02FgqzVyu7590+38eugxER5HGbaJn640SIy43z78ookGG7 IiuNoANjVxumaeK3EzSUiGWA6l37MWGjyOazSwJiXZoZJN+w5Sv6r5nDCOfXJHq+1Wy/ 9GlMplOaMGti/H2rWgO0UCalsSZ8v3iCLBJAGcjWdYah6uFeKwc7Ha51xtIRobGTCdpU yi2Q== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 w61si67572qte.335.2018.01.02.19.09.38; Tue, 02 Jan 2018 19:09:39 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id CE87060940; Wed, 3 Jan 2018 03:09:38 +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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 0D3C460846; Wed, 3 Jan 2018 03:01:10 +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 D374A60A4A; Wed, 3 Jan 2018 03:00:55 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 96AB0608D9 for ; Wed, 3 Jan 2018 03:00:16 +0000 (UTC) Received: from mxback14g.mail.yandex.net (mxback14g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:93]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 9DC82182D00 for ; Wed, 3 Jan 2018 06:00:15 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback14g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ldMmFtUOOn-0F0GE2Ab; Wed, 03 Jan 2018 06:00:15 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0FZOr0M4; Wed, 03 Jan 2018 06:00:15 +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: Wed, 3 Jan 2018 06:00:03 +0300 Message-Id: <1514948409-30862-10-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 9/15] travis: run tests with dynamically-linked tests 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 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fa352b572..a70df39d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,7 @@ env: - CONF="--enable-schedule-iquery" - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" + - CONF="--disable-static-tests" - CROSS_ARCH="arm64" - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - CROSS_ARCH="powerpc" From patchwork Wed Jan 3 03:00:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123276 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9684088qgn; Tue, 2 Jan 2018 19:10:22 -0800 (PST) X-Google-Smtp-Source: ACJfBov9/v7q2RijfFBEdAWI/jYgNYuTqiQgMf8v/D4yrXm78f9EevrMY6BB8jN49RV8ISnojw+u X-Received: by 10.200.38.74 with SMTP id v10mr137047qtv.316.1514949022643; Tue, 02 Jan 2018 19:10:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514949022; cv=none; d=google.com; s=arc-20160816; b=HlpeWvSYzHEZabou8FlwhAeHSyCJy2ryNyd1Hf+sJucGmmSvvXfn08XQFjqSnn43Kp qBlNmJNZptENalpDfmcjiHkE7kE9PIZaNavGfCcGy8LjeciZJgTiRJ5uT1xdj7OAnXW0 O562QdoDxsbIftkzBXn+mnHqW6UsnhU6eYmy4clvM8DK+ZwTcBVh+5aRKgkFtLZnd1wM PimRQlXfKyTCNDznZFqn/XaZs/8VeHyIHkER1+jvPTPRenK+6kOMMLDsJVw7xR7hp7gn b2EqMqNOofR9G1RXpWjuh1uWpXH/Eq3zdpW2VRA09zxvOIy9cOxJkBJFV5XWUY0tLGfE JFLQ== 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=11cyPzU4r6ku7BHuy9GMExpcaw1jKHsH/F24V7X1GOk=; b=wu1jQSAHiZpjhNt7A7pi2x9MreIDhHD8+LeASSok0GH/8RGm3kFueL1ERuOowlTxho A1kbRJOIKqKypeldh+KH5MlzNnkOh2Nxg299LTdYIOwwOG787TyXIXWir2yWAUPGVdj4 RDPmdHzTYJwFL+LQQpnxiClXD6rgQQPyKJF4OdbXu+/D29cotXA9xSFVCwyS8/9r/XaT 3rtLAcr0+GDA83Ip3fgX43qqSmfEanbCoKP/yW2bHGaWBYuFy06dcUUXdCI5uM8ptrpF Yq1Il48C596MQ+B+fFbU1mITlnsKl3uJYMnN6TgIxAsv/AOkayuH8tPuxeiaG8DFBgog 0FFA== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 o15si78213qto.231.2018.01.02.19.10.22; Tue, 02 Jan 2018 19:10:22 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 249F860956; Wed, 3 Jan 2018 03:10:22 +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 4E48360A4A; Wed, 3 Jan 2018 03:01:18 +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 353AE607E4; Wed, 3 Jan 2018 03:01:00 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id 99853607E4 for ; Wed, 3 Jan 2018 03:00:17 +0000 (UTC) Received: from mxback13g.mail.yandex.net (mxback13g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:92]) by forward106p.mail.yandex.net (Yandex) with ESMTP id 3CE762D8126F for ; Wed, 3 Jan 2018 06:00:16 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback13g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id in2Je7aihw-0GV0js65; Wed, 03 Jan 2018 06:00:16 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0FZeTX3r; Wed, 03 Jan 2018 06:00:15 +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: Wed, 3 Jan 2018 06:00:04 +0300 Message-Id: <1514948409-30862-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 10/15] helper/tests: use common Makefile.inc for tests 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 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ helper/test/Makefile.am | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 8eee643be..662d6c758 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -1,26 +1,4 @@ -TESTS_ENVIRONMENT = EXEEXT=${EXEEXT} - -LIB = $(top_builddir)/lib - -#in the following line, the libs using the symbols should come before -#the libs containing them! The includer is given a chance to add things -#before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la - -INCFLAGS = \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/helper - -ODP_PLATFORM=${with_platform} - -AM_CPPFLAGS = $(INCFLAGS) -AM_LDFLAGS = -static +include $(top_srcdir)/test/Makefile.inc EXECUTABLES = chksum \ cuckootable \ From patchwork Wed Jan 3 03:00:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123277 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9684769qgn; Tue, 2 Jan 2018 19:11:21 -0800 (PST) X-Google-Smtp-Source: ACJfBosPjl7RZVxA06BVXHBDiBSnLhc0ygw+4bD5gjpj5QGVGT4i9/qFrQQR/BV3s/16cQJ39UiY X-Received: by 10.55.215.93 with SMTP id m90mr133669qki.27.1514949081624; Tue, 02 Jan 2018 19:11:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514949081; cv=none; d=google.com; s=arc-20160816; b=CGKzOu5WXY0LlAJUZPFT65CAronCzpsX7vpkqAZpHFPjUXnlEL1mye17pmoVNIb8CD Q/3EKPAgpTEbdPBBjb3D3y0HD2yHlQnw+faI95Rgy7S1lUQyJs0Sy0f1ihUVC7lxVomS 558d/xO19Ora1dcisSV/iY4PhSR7Vwo/d3i9k3j0hbeXaODfY9CX2m8/Q4gzHlkPoZeH 4N08XlO3uBbPNAdHXQrkqQHXawKTAo1Pb8KL8zBf2kS7YZA1Fn5oVOBCrpaKRItjV3MQ zC50E/Qft7smbffrfX1nMMurqegmVWcqy71E28cpHAL2N3mWeOAH4t/JfmoSaKs3Nh3U zBFg== 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=YxvndzGIctd+OJhtKXpHdqMdAFW3gWTBHq79OxDOZis=; b=i7jBGbwz1ofeFzt+frA/XrRx7mHq8T8PzPcL/E+eNI8q5gt/2wRNHUNX1eChJEV0ca uBDE5/b8gAKutvWZgcExtl40t0Mvi7DaA4YPTQFyWC5GAMT2PCb4Nv8CzsnJ2bg0J1Aa DXvdScSQpPBeNDFg6Kze7aryAZcOg3z8jOSrsryD8NXQUQ/PMbXrJEMxm+wCQsmKEw+Y 3psVNPJC+uZuuJgxoPviJWJDvA7xfHScnCagR6CbIlvCEQPgjSt0DAb4Drel4xp5ZEQY ajjLxTNz7swl68tSoSvad2i/jG5ZRlOQHVhbkGdQcTqkdYxsZimJqFaRZfFDZ0xvHUlA et8Q== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 n62si72964qka.348.2018.01.02.19.11.21; Tue, 02 Jan 2018 19:11:21 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 4302B60BF4; Wed, 3 Jan 2018 03:11:21 +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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 8FB8E60C31; Wed, 3 Jan 2018 03:01:23 +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 087D06095D; Wed, 3 Jan 2018 03:01:01 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id 226C5608DD for ; Wed, 3 Jan 2018 03:00:18 +0000 (UTC) Received: from mxback5j.mail.yandex.net (mxback5j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10e]) by forward104o.mail.yandex.net (Yandex) with ESMTP id C7FCB701C26 for ; Wed, 3 Jan 2018 06:00:16 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback5j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id WNyzwhn2vu-0GXm7woJ; Wed, 03 Jan 2018 06:00:16 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0GZSwmHA; Wed, 03 Jan 2018 06:00:16 +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: Wed, 3 Jan 2018 06:00:05 +0300 Message-Id: <1514948409-30862-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 11/15] validation: time: use time() instead of clock() 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 ODP test for time API uses clock() to compare time against. However clock() returns processor time used by program, which can differ between runs. Use time() as a time source to compare against. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ test/validation/api/time/time.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c index c8f90dbac..95422b683 100644 --- a/test/validation/api/time/time.c +++ b/test/validation/api/time/time.c @@ -423,11 +423,11 @@ static void time_test_accuracy(time_cb time_cur, time_from_ns_cb time_from_ns) { int i; odp_time_t t1, t2, wait, diff; - clock_t c1, c2; + time_t c1, c2; double sec_t, sec_c; odp_time_t sec = time_from_ns(ODP_TIME_SEC_IN_NS); - c1 = clock(); + c1 = time(NULL); t1 = time_cur(); wait = odp_time_sum(t1, sec); @@ -436,12 +436,12 @@ static void time_test_accuracy(time_cb time_cur, time_from_ns_cb time_from_ns) wait = odp_time_sum(wait, sec); } + c2 = time(NULL); t2 = time_cur(); - c2 = clock(); diff = odp_time_diff(t2, t1); sec_t = ((double)odp_time_to_ns(diff)) / ODP_TIME_SEC_IN_NS; - sec_c = ((double)(c2 - c1)) / CLOCKS_PER_SEC; + sec_c = ((double)(c2 - c1)); /* Check that ODP time is within +-5% of system time */ CU_ASSERT(sec_t < sec_c * 1.05); From patchwork Wed Jan 3 03:00:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123279 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9685771qgn; Tue, 2 Jan 2018 19:12:51 -0800 (PST) X-Google-Smtp-Source: ACJfBosHdVSx94krmQyVaArfEjoF26VhCvE1EREP3wF82EoeVPW95zE9083WoFXM0Eqje42Fbk9b X-Received: by 10.55.75.194 with SMTP id y185mr114076qka.339.1514949171624; Tue, 02 Jan 2018 19:12:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514949171; cv=none; d=google.com; s=arc-20160816; b=HPzB7vgTKRcijGZXzNND3y1qtSlIlKMb2W+M1arUaGPB4/rE0FZAI8PLC0s62AxjQ3 iGUEJHGVDU8UI5TKZdj7utAnU6hOD6w2IpVrAE/5FJcv+RTNd1u1j/K6mp78E6p5wR/l xxpD3Zp2EPqJKCpiQM9ZrgoLFQwC21D3OrXx1MxllS6xngMG6ml6E5MrmAUwlaJnGwTf 2UWsxmTPF+rHxp6ORn9DVrBhUM42GOHWOy0IC5xm9UC3yDdPdSdzMJKCBmhfmcDwNwIZ RGbJZB5JcVt7QcZXFN3iUg39t4yg+Lp4XqjvNUeYldA4Xn1gRxpxy0ZzY403NDlIGKMB kq2Q== 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=cL/SwY3lv9Zw9OeF8XAMLV883MUEhetScm9R4h+XskA=; b=0WtlhYKdpJYalbTCxnB1H4JVnk2Z4g17MQR88GYyOY9oro7BvEedYknupaE/J+k09i QAFDzeJQ4jZ+EBx/pwdPT01BxQ+RABOjmktNuhXPhNYGzvruGjjwqSyqUQEI5W4ZROCl /FcHVkMwiV0x+oiRxxrUMW8ey5ywlt07HmZecMfH6NVBoS278dEypxeKhd4tE4WZBMnF SORl6Wok4MtQnLnNodLksqVkO6gcLFSybXwXZtAoH4jeP1WIwvft18yb+miCs9hu9CdF pUdXEuEv947qb+e27m3EtQlVyR9YSbYpiEhL3Q+eehvWm7bQiitflTg1cPwkRDWN62Zd wUCA== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 r11si83432qtc.154.2018.01.02.19.12.51; Tue, 02 Jan 2018 19:12:51 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 53D9C609A2; Wed, 3 Jan 2018 03:12:51 +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, RCVD_IN_MSPIKE_H2, 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 18FEC614E3; Wed, 3 Jan 2018 03:01:33 +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 C3DD8607E4; Wed, 3 Jan 2018 03:01:02 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 3AC64608E2 for ; Wed, 3 Jan 2018 03:00:18 +0000 (UTC) Received: from mxback9j.mail.yandex.net (mxback9j.mail.yandex.net [IPv6:2a02:6b8:0:1619::112]) by forward102p.mail.yandex.net (Yandex) with ESMTP id 45E144302D9E for ; Wed, 3 Jan 2018 06:00:17 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback9j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id BbPnMiTTZ3-0H5m2l16; Wed, 03 Jan 2018 06:00:17 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0GZm8etV; Wed, 03 Jan 2018 06:00:16 +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: Wed, 3 Jan 2018 06:00:06 +0300 Message-Id: <1514948409-30862-13-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 12/15] linux-gen: don't use SYSCONFDIR 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 sysconfig is not used in TigerMoth, so let's drop the variable in linux-gen's Makefile. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ platform/linux-generic/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 92ce2cce6..b7a8ff255 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS += -I$(top_builddir)/include AM_CPPFLAGS += -Iinclude AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/default -AM_CPPFLAGS += -DSYSCONFDIR=\"@sysconfdir@\" AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) From patchwork Wed Jan 3 03:00:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123278 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9685267qgn; Tue, 2 Jan 2018 19:12:08 -0800 (PST) X-Google-Smtp-Source: ACJfBotzS9ApcqAyo4OUDrpMs/rsjD9rZHpXjWx1hB3hXOImtOUbWHKrNWYqad+djA2gzz2+snYl X-Received: by 10.55.207.88 with SMTP id e85mr134024qkj.57.1514949128341; Tue, 02 Jan 2018 19:12:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514949128; cv=none; d=google.com; s=arc-20160816; b=uOtT5SoOuwQxiVJ0vm8sTHo7MciSRZkmtzje7ehXmMf8f4Ff3Kj7qMmZZoBBYeFZtU 4OH62MJZu6drGglSARSf5jMmQjfSPGxHJ0U15Rvi4TeGWwCrpdGhi+Ijl2YqIQ4vRvrI AruzAj/TJBeuVDY8tZcDVR9pG0j0diZvxCr1p7OWCRQevLcv/zdVLcMLXrZNdYItEoDM QLKe5QKEbyMPU7wLYDJ7pqqsdDgGOJ7fH5yrbOLFvUonIk7KVoHa2rdHLSqufNjzY4OA lkjH+7n86WKgmd4jyZeKfQq/buWkMODSOdQtWEARepPlHPkrP9MYpNzgtihgJVrlWY/Y LPEg== 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=b4s/V66kgvv4tIsn2S/jbvlm4BaVAKNZJgrO6UxoN9w=; b=QNcBFVv85tnSYudVBa3wa6lgp8PkmcrQtfcOQkodunKDHd9Hz9yVEl4PVyODvCc8Rt r0LeHxOI47NVGUlrHkLxYvFzYA3YZKTyDoPJ7AnJ6HuWB9vxlypEH1DwQ/Fd+U/CiZTz PQuNDpmJZ+osdVg/pN+sRZGKAGgIO9iDBgOtGU2Fd7PylL9LpufTZKEYV9OqW51NC3JN Uc+PH5+fn9N0IN5JlY2A8M9Hd2aoN2wqtBNvdVLz3JdCY076YnKTsdxGJGumM4sNMwah zoWoZNPgXZWCw7Bbg96YAKYcDwqQa+5LD2EC+yEY/S0k4V0TMghDyKfHOEbo2ed32yCt G4/A== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 s51si85787qtj.117.2018.01.02.19.12.08; Tue, 02 Jan 2018 19:12:08 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 09A1760BF4; Wed, 3 Jan 2018 03:12:08 +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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 CD67B610A7; Wed, 3 Jan 2018 03:01:27 +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 13E09607BA; Wed, 3 Jan 2018 03:01:02 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 27AA8607BA for ; Wed, 3 Jan 2018 03:00:19 +0000 (UTC) Received: from mxback20j.mail.yandex.net (mxback20j.mail.yandex.net [IPv6:2a02:6b8:0:1619::114]) by forward102j.mail.yandex.net (Yandex) with ESMTP id DF4885602A48 for ; Wed, 3 Jan 2018 06:00:17 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback20j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id zYmnp02kbR-0HrSSvwZ; Wed, 03 Jan 2018 06:00:17 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0HZeMV2k; Wed, 03 Jan 2018 06:00:17 +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: Wed, 3 Jan 2018 06:00:07 +0300 Message-Id: <1514948409-30862-14-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 13/15] tests: don't use ODP_SYSCONFIG_FILE 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 libconfig is not used in TigerMoth, so let's drop the variable in test's Makefile.inc. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ test/Makefile.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/Makefile.inc b/test/Makefile.inc index 857de4512..267c28a26 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -27,5 +27,4 @@ endif @VALGRIND_CHECK_RULES@ TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} \ - EXEEXT=${EXEEXT} \ - ODP_SYSCONFIG_FILE=none + EXEEXT=${EXEEXT} From patchwork Wed Jan 3 03:00:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123281 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9687589qgn; Tue, 2 Jan 2018 19:15:34 -0800 (PST) X-Google-Smtp-Source: ACJfBou0J0+ul75z6iL8theMkQj0/76kSfzwy1vhP/8d4NIQgiS03EWap4p148JvOJaHBGpA0urQ X-Received: by 10.55.183.67 with SMTP id h64mr139470qkf.67.1514949334292; Tue, 02 Jan 2018 19:15:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514949334; cv=none; d=google.com; s=arc-20160816; b=fHb6d1t38Huw8JyQbnAGKIYig6/Kw9jTAsVteaQ1unxWCweDpd5WonmIoDhxJzfqWQ 8Q74dD//Pl5oDhV3aTm5SV7BzhzOhrbMs++vsHcksmStWPWkjrILAWYyoyE2WPHcPXcL W964EcXrRFiLcotuIn17X9CLazFW5LjvJ3ZNxcX+0mNgPqbC3nbwgxpICBE6jjUD/+kB AcIJgA7m1LX47aYAvl/eLjkDaKB8TCXoKJI95PgBcUcdeNoOu/zF+oj7eIbine7oD05A GHT4+wcicbQPRLZzwSgUptO742YSnUrSJj3shAa0QdLuZ9I+ovf9quGHQLTZGrqbaCyn WjWA== 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=9X7LIaBysBMiP/P2K52dLAdFvzd1XvH+sokH6qcPvJ0=; b=M3gqreaSJmDdbfxuP1QHp7eXSSI/y/1J+j2+WHG4PLa+YtuLyfnxZFlC2mNB4PEY2a iEu9OxQYJP2+TUaDPfjyDRLjXCyIshsF4xkFReGS32Ba23wS1GnyeometZ42lQeeP425 ZYA4zCODXabB5IGC+asu6ViqoiKh8svCkjwJL2FniKFcv8vQWDmNj9fCr0jqvMZWRfOO b79A0Ss1essDq4Ta3FV8LNaIbu0lAjZZxxgPIEWJFSt8qqeoGD0fkfKnooky5FYRJcl9 n4VSzMgVtd/tboeb4sbNkmEg0/1HDb3qljr9Ly7APz2WIbdh6BsgRyl13A2q0yYidaHy VRzQ== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 p24si77426qtp.376.2018.01.02.19.15.34; Tue, 02 Jan 2018 19:15:34 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id D698E60958; Wed, 3 Jan 2018 03:15:33 +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.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, 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 9965161527; Wed, 3 Jan 2018 03:01:55 +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 54C00606F2; Wed, 3 Jan 2018 03:01:09 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 8A7FA606F2 for ; Wed, 3 Jan 2018 03:00:19 +0000 (UTC) Received: from mxback8g.mail.yandex.net (mxback8g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:169]) by forward101j.mail.yandex.net (Yandex) with ESMTP id 9043D1242DB1 for ; Wed, 3 Jan 2018 06:00:18 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback8g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 0mn7CQtq1f-0Ita5JuX; Wed, 03 Jan 2018 06:00:18 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0HZGs49M; Wed, 03 Jan 2018 06:00:17 +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: Wed, 3 Jan 2018 06:00:08 +0300 Message-Id: <1514948409-30862-15-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 14/15] example: ipsec_api: remove file conflict with ipsec example 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 ipsec_api example installs program with the same name, as ipsec example does. Remove file conflict between two examples. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ example/ipsec_api/Makefile.am | 27 +++++++++++----------- ...sec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} | 2 +- ...c_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} | 2 +- ...ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} | 2 +- ..._tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} | 2 +- ...c_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} | 2 +- ...run_esp_out.sh => odp_ipsec_api_run_esp_out.sh} | 2 +- ...p_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} | 2 +- ...tun_out.sh => odp_ipsec_api_run_esp_tun_out.sh} | 2 +- ...ipsec_run_live.sh => odp_ipsec_api_run_live.sh} | 2 +- ...c_run_router.sh => odp_ipsec_api_run_router.sh} | 2 +- ...c_run_simple.sh => odp_ipsec_api_run_simple.sh} | 2 +- 12 files changed, 25 insertions(+), 24 deletions(-) rename example/ipsec_api/{odp_ipsec_run_ah_in.sh => odp_ipsec_api_run_ah_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_out.sh => odp_ipsec_api_run_ah_out.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_in.sh => odp_ipsec_api_run_ah_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_ah_tun_out.sh => odp_ipsec_api_run_ah_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_in.sh => odp_ipsec_api_run_esp_in.sh} (91%) rename example/ipsec_api/{odp_ipsec_run_esp_out.sh => odp_ipsec_api_run_esp_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_in.sh => odp_ipsec_api_run_esp_tun_in.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_esp_tun_out.sh => odp_ipsec_api_run_esp_tun_out.sh} (92%) rename example/ipsec_api/{odp_ipsec_run_live.sh => odp_ipsec_api_run_live.sh} (94%) rename example/ipsec_api/{odp_ipsec_run_router.sh => odp_ipsec_api_run_router.sh} (85%) rename example/ipsec_api/{odp_ipsec_run_simple.sh => odp_ipsec_api_run_simple.sh} (87%) diff --git a/example/ipsec_api/Makefile.am b/example/ipsec_api/Makefile.am index 14bc5dd66..848683e00 100644 --- a/example/ipsec_api/Makefile.am +++ b/example/ipsec_api/Makefile.am @@ -3,22 +3,23 @@ include $(top_srcdir)/example/Makefile.inc AM_CPPFLAGS = $(OPENSSL_CPPFLAGS) LDADD += $(OPENSSL_LIBS) -bin_PROGRAMS = odp_ipsec +bin_PROGRAMS = odp_ipsec_api dist_bin_SCRIPTS = \ - $(srcdir)/odp_ipsec_run_ah_in.sh \ - $(srcdir)/odp_ipsec_run_ah_out.sh \ - $(srcdir)/odp_ipsec_run_ah_tun_in.sh \ - $(srcdir)/odp_ipsec_run_ah_tun_out.sh \ - $(srcdir)/odp_ipsec_run_esp_in.sh \ - $(srcdir)/odp_ipsec_run_esp_out.sh \ - $(srcdir)/odp_ipsec_run_esp_tun_in.sh \ - $(srcdir)/odp_ipsec_run_esp_tun_out.sh \ - $(srcdir)/odp_ipsec_run_live.sh \ - $(srcdir)/odp_ipsec_run_router.sh \ - $(srcdir)/odp_ipsec_run_simple.sh + $(srcdir)/odp_ipsec_api_run_ah_in.sh \ + $(srcdir)/odp_ipsec_api_run_ah_out.sh \ + $(srcdir)/odp_ipsec_api_run_ah_tun_in.sh \ + $(srcdir)/odp_ipsec_api_run_ah_tun_out.sh \ + $(srcdir)/odp_ipsec_api_run_esp_in.sh \ + $(srcdir)/odp_ipsec_api_run_esp_out.sh \ + $(srcdir)/odp_ipsec_api_run_esp_tun_in.sh \ + $(srcdir)/odp_ipsec_api_run_esp_tun_out.sh \ + $(srcdir)/odp_ipsec_api_run_live.sh \ + $(srcdir)/odp_ipsec_api_run_router.sh \ + $(srcdir)/odp_ipsec_api_run_simple.sh -odp_ipsec_SOURCES = odp_ipsec.c \ +odp_ipsec_api_SOURCES = \ + odp_ipsec.c \ odp_ipsec_sa_db.c \ odp_ipsec_sa_db.h \ odp_ipsec_sp_db.c \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_in.sh b/example/ipsec_api/odp_ipsec_api_run_ah_in.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_ah_in.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_in.sh index c5b105f59..becfc8928 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:ah \ -a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_out.sh b/example/ipsec_api/odp_ipsec_api_run_ah_out.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_ah_out.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_out.sh index c8926d5ac..023809a18 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:ah \ -a 192.168.111.2:192.168.222.2:md5:200:a731649644c5dee92cbd9c2e7e188ee6 \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_tun_in.sh b/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_ah_tun_in.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh index a0d4c4332..40c488f04 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_tun_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_tun_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:ah \ -a 192.168.222.2:192.168.111.2:md5:300:27f6d123d7077b361662fc6e451f65d8 \ diff --git a/example/ipsec_api/odp_ipsec_run_ah_tun_out.sh b/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_ah_tun_out.sh rename to example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh index 74a0e3b42..d7118586f 100755 --- a/example/ipsec_api/odp_ipsec_run_ah_tun_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_ah_tun_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:ah \ -a 192.168.111.2:192.168.222.2:md5:200:a731649644c5dee92cbd9c2e7e188ee6 \ diff --git a/example/ipsec_api/odp_ipsec_run_esp_in.sh b/example/ipsec_api/odp_ipsec_api_run_esp_in.sh similarity index 91% rename from example/ipsec_api/odp_ipsec_run_esp_in.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_in.sh index 39e171cdf..cdb302ef4 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:esp \ -e 192.168.222.2:192.168.111.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_esp_out.sh b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_out.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_out.sh index 98ab04e52..f1c15ffee 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:esp \ -e 192.168.111.2:192.168.222.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_esp_tun_in.sh b/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_tun_in.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh index 7ef3e2d08..5d78479e4 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_tun_in.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_tun_in.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.111.2/32:loop1:08.00.27.76.B5.E0 \ -p 192.168.222.0/24:192.168.111.0/24:in:esp \ -e 192.168.222.2:192.168.111.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_esp_tun_out.sh b/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh similarity index 92% rename from example/ipsec_api/odp_ipsec_run_esp_tun_out.sh rename to example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh index 98ab04e52..f1c15ffee 100755 --- a/example/ipsec_api/odp_ipsec_run_esp_tun_out.sh +++ b/example/ipsec_api/odp_ipsec_api_run_esp_tun_out.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:esp \ -e 192.168.111.2:192.168.222.2:\ diff --git a/example/ipsec_api/odp_ipsec_run_live.sh b/example/ipsec_api/odp_ipsec_api_run_live.sh similarity index 94% rename from example/ipsec_api/odp_ipsec_run_live.sh rename to example/ipsec_api/odp_ipsec_api_run_live.sh index b506b2af8..9bc0a60f3 100755 --- a/example/ipsec_api/odp_ipsec_run_live.sh +++ b/example/ipsec_api/odp_ipsec_api_run_live.sh @@ -3,7 +3,7 @@ # Live router test # - 2 interfaces interfaces # - Specify API mode on command line -sudo odp_ipsec -i p7p1,p8p1 \ +sudo odp_ipsec_api -i p7p1,p8p1 \ -r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \ -r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \ -p 192.168.111.0/24:192.168.222.0/24:out:both \ diff --git a/example/ipsec_api/odp_ipsec_run_router.sh b/example/ipsec_api/odp_ipsec_api_run_router.sh similarity index 85% rename from example/ipsec_api/odp_ipsec_run_router.sh rename to example/ipsec_api/odp_ipsec_api_run_router.sh index 31b9e7656..982a27e97 100755 --- a/example/ipsec_api/odp_ipsec_run_router.sh +++ b/example/ipsec_api/odp_ipsec_api_run_router.sh @@ -3,7 +3,7 @@ # Live router test # - 2 interfaces interfaces # - Specify API mode on command line -sudo odp_ipsec -i p7p1,p8p1 \ +sudo odp_ipsec_api -i p7p1,p8p1 \ -r 192.168.111.2/32:p7p1:08.00.27.76.B5.E0 \ -r 192.168.222.2/32:p8p1:08.00.27.F5.8B.DB \ -c 1 "$@" diff --git a/example/ipsec_api/odp_ipsec_run_simple.sh b/example/ipsec_api/odp_ipsec_api_run_simple.sh similarity index 87% rename from example/ipsec_api/odp_ipsec_run_simple.sh rename to example/ipsec_api/odp_ipsec_api_run_simple.sh index ddda612a8..bdc2777c9 100755 --- a/example/ipsec_api/odp_ipsec_run_simple.sh +++ b/example/ipsec_api/odp_ipsec_api_run_simple.sh @@ -4,7 +4,7 @@ # - 2 loop interfaces # - 10 packets # - Specify API mode on command line -odp_ipsec -i loop1,loop2 \ +odp_ipsec_api -i loop1,loop2 \ -r 192.168.222.2/32:loop2:08.00.27.F5.8B.DB \ -s 192.168.111.2:192.168.222.2:loop1:loop2:10:100 \ -c 2 "$@" From patchwork Wed Jan 3 03:00:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123280 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9686536qgn; Tue, 2 Jan 2018 19:13:57 -0800 (PST) X-Google-Smtp-Source: ACJfBosYJ5PF5BPUQC3HXpZADhxbQA0rWXmVOG5ujPt2Mv2bdiTn4FDQqOH7Q0kfALeVNmNzN8P/ X-Received: by 10.237.38.199 with SMTP id q65mr129804qtd.3.1514949237001; Tue, 02 Jan 2018 19:13:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514949236; cv=none; d=google.com; s=arc-20160816; b=FtI3psV+CynVvcUkPTB+RWKFDae4aeGpFJcRefeEhfPxnQLw9iGDOHxtZ39kHL+vit nuWwFriSHOGOSarNQ03HV7We0VFtw6TqxJYO9PpioEBksDxE24fJYlRhdrZeBZZSctPd fdZ9inZie/O7vdD1zEojmt5rzpt06bYMkFC07+5omULld6DHbErwj2NA13Y+o2Zb+Rwg IX3SecaSRpSlVus3Weo83Au7xxltQu242OUcnEc0KPxJapaH5PUjpVRzZyMfDJ6Yg6q5 r8I8hBXRFYGLCwuzFr5XN+RmhEwg5Jx37E9HbHrLm0TnYkrDP5bqRjN64bqgUUAKV30F EtMw== 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=iRq6lzLk6kNjA4c3ihDpFBwx9DH44hwD5BKudKquRrQ=; b=R6LANq9EdKkIVlzvvYlfGJasvVIiFU3DdxZU7Phhg04uDYLbwu41sVc4G7m1W0+/PS 784545/l4E+SA6eM/DVD1eZpBeb84Sqv26pLVC3k/CPyGRAI3mhC1lJyT0GS0BxYcbc+ jTV71rU7QUWbAinkVETG4ges5VdemaM9y8EF6lsQ/wuYwLIgNv6brPvV4dfcmEd4zMHc GjTTvUOZxCls8xkyDNYZGqwGWepL3C4h2YJpzhylyql4ToshW5FsRaWn3/qeXogJXPVi SQZgDu85e9gratRsMajE6VMtR9SDfS0k0xi5crwq/OyGMFk3Vf1rUD9qG5d++Ln/hFbi ZAYQ== 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru 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 n127si86668qkc.170.2018.01.02.19.13.56; Tue, 02 Jan 2018 19:13:56 -0800 (PST) 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=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id A3BA2608FD; Wed, 3 Jan 2018 03:13:56 +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.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, 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 64B4E6151B; Wed, 3 Jan 2018 03:01:38 +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 E883660846; Wed, 3 Jan 2018 03:01:08 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id 6E0AB60846 for ; Wed, 3 Jan 2018 03:00:20 +0000 (UTC) Received: from mxback2o.mail.yandex.net (mxback2o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1c]) by forward102o.mail.yandex.net (Yandex) with ESMTP id 68BD65A026A1 for ; Wed, 3 Jan 2018 06:00:19 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback2o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id HPMKAeC9Q2-0J4mLKtO; Wed, 03 Jan 2018 06:00:19 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id zIYVm0231v-0IZmFplr; Wed, 03 Jan 2018 06:00:18 +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: Wed, 3 Jan 2018 06:00:09 +0300 Message-Id: <1514948409-30862-16-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> References: <1514948409-30862-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v9 15/15] validation: stop overriding LDADD variable 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 LDADD variable can be used to pass other libraries (like DPDK). Stop overriding LDADD entirely. Instead use PRELDADD variable or appending to LDADD. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496 **/ platform/linux-generic/test/Makefile.inc | 19 +------------------ platform/linux-generic/test/ring/Makefile.am | 4 +--- .../linux-generic/test/validation/api/Makefile.inc | 2 +- .../test/validation/api/shmem/Makefile.am | 9 +-------- test/Makefile.inc | 14 ++++++++++++-- test/validation/api/Makefile.inc | 11 +---------- test/validation/api/atomic/Makefile.am | 1 - test/validation/api/barrier/Makefile.am | 1 - test/validation/api/buffer/Makefile.am | 1 - test/validation/api/chksum/Makefile.am | 1 - test/validation/api/classification/Makefile.am | 1 - test/validation/api/cpumask/Makefile.am | 2 +- test/validation/api/crypto/Makefile.am | 1 - test/validation/api/errno/Makefile.am | 1 - test/validation/api/event/Makefile.am | 1 - test/validation/api/hash/Makefile.am | 1 - test/validation/api/init/Makefile.am | 3 --- test/validation/api/ipsec/Makefile.am | 5 +---- test/validation/api/lock/Makefile.am | 1 - test/validation/api/packet/Makefile.am | 1 - test/validation/api/pktio/Makefile.am | 1 - test/validation/api/pool/Makefile.am | 1 - test/validation/api/queue/Makefile.am | 1 - test/validation/api/random/Makefile.am | 1 - test/validation/api/scheduler/Makefile.am | 1 - test/validation/api/shmem/Makefile.am | 1 - test/validation/api/std_clib/Makefile.am | 1 - test/validation/api/system/Makefile.am | 1 - test/validation/api/thread/Makefile.am | 2 +- test/validation/api/time/Makefile.am | 1 - test/validation/api/timer/Makefile.am | 1 - test/validation/api/traffic_mngr/Makefile.am | 2 +- 32 files changed, 21 insertions(+), 73 deletions(-) diff --git a/platform/linux-generic/test/Makefile.inc b/platform/linux-generic/test/Makefile.inc index 419a63d1c..c5f6caf03 100644 --- a/platform/linux-generic/test/Makefile.inc +++ b/platform/linux-generic/test/Makefile.inc @@ -2,21 +2,4 @@ # build specific ODP applications, (i.e those whose do more than validation # test wrapping) -AM_LDFLAGS = -static - -AM_CFLAGS = $(CUNIT_CFLAGS) - -LIBCUNIT_COMMON = $(top_builddir)/test/common/libcunit_common.la -LIB = $(top_builddir)/lib -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_LIBS_LT) - -INCCUNIT_COMMON = -I$(top_srcdir)/test/common -INCODP = \ - -I$(top_builddir)/include \ - -I$(top_builddir)/platform/@with_platform@/include \ - -I$(top_srcdir)/helper/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ - -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/test +include $(top_srcdir)/test/Makefile.inc diff --git a/platform/linux-generic/test/ring/Makefile.am b/platform/linux-generic/test/ring/Makefile.am index 376047559..d5b4a5187 100644 --- a/platform/linux-generic/test/ring/Makefile.am +++ b/platform/linux-generic/test/ring/Makefile.am @@ -6,6 +6,4 @@ ring_main_SOURCES = \ ring_suites.c ring_suites.h \ ring_basic.c ring_stress.c -ring_main_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/include \ - $(INCCUNIT_COMMON) $(INCODP) -ring_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) +PRELDADD += $(LIBCUNIT_COMMON) diff --git a/platform/linux-generic/test/validation/api/Makefile.inc b/platform/linux-generic/test/validation/api/Makefile.inc index c47217d1a..cda6237ea 100644 --- a/platform/linux-generic/test/validation/api/Makefile.inc +++ b/platform/linux-generic/test/validation/api/Makefile.inc @@ -1 +1 @@ -include $(top_srcdir)/platform/linux-generic/test/validation/Makefile.inc +include $(top_srcdir)/test/validation/api/Makefile.inc diff --git a/platform/linux-generic/test/validation/api/shmem/Makefile.am b/platform/linux-generic/test/validation/api/shmem/Makefile.am index 131a511be..07d311d2f 100644 --- a/platform/linux-generic/test/validation/api/shmem/Makefile.am +++ b/platform/linux-generic/test/validation/api/shmem/Makefile.am @@ -7,16 +7,9 @@ test_PROGRAMS = shmem_linux shmem_odp1 shmem_odp2 shmem_linux_SOURCES = shmem_linux.c shmem_linux.h shmem_common.h shmem_linux_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/include shmem_linux_LDFLAGS = $(AM_LDFLAGS) -lrt +shmem_linux_LDADD = #shmem_odp1 and shmem_odp2 are the 2 ODP processes: shmem_odp1_SOURCES = shmem_odp1.c shmem_odp1.h shmem_common.h -shmem_odp1_CFLAGS = $(AM_CFLAGS) \ - $(INCCUNIT_COMMON) \ - $(INCODP) -shmem_odp1_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) shmem_odp2_SOURCES = shmem_odp2.c shmem_odp2.h shmem_common.h -shmem_odp2_CFLAGS = $(AM_CFLAGS) \ - $(INCCUNIT_COMMON) \ - $(INCODP) -shmem_odp2_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/Makefile.inc b/test/Makefile.inc index 267c28a26..81854e262 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,9 +1,18 @@ LIB = $(top_builddir)/lib +COMMON_DIR = $(top_builddir)/test/common + +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la + +LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la +LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la +LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la + #in the following line, the libs using the symbols should come before #the libs containing them! The includer is given a chance to add things -#before libodp by setting PRE_LDADD before the inclusion. -LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la $(DPDK_LIBS_LT) +#before libodp by setting PRELDADD before the inclusion. +LDADD = $(PRELDADD) $(LIBODP) $(DPDK_LIBS_LT) +PRELDADD = INCFLAGS = \ -I$(top_builddir)/platform/@with_platform@/include \ @@ -16,6 +25,7 @@ INCFLAGS = \ -I$(top_builddir)/include AM_CPPFLAGS = $(INCFLAGS) +AM_CPPFLAGS += -I$(top_srcdir)/test/common AM_CFLAGS = $(CUNIT_CFLAGS) if STATIC_LINK diff --git a/test/validation/api/Makefile.inc b/test/validation/api/Makefile.inc index 6e66301be..8610b5687 100644 --- a/test/validation/api/Makefile.inc +++ b/test/validation/api/Makefile.inc @@ -1,12 +1,3 @@ include $(top_srcdir)/test/Makefile.inc -COMMON_DIR = $(top_builddir)/test/common - -AM_CFLAGS += -I$(top_srcdir)/test/common - -AM_CFLAGS += $(CUNIT_CFLAGS) - -LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la -LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la -LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la -LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la +PRELDADD += $(LIBCUNIT_COMMON) diff --git a/test/validation/api/atomic/Makefile.am b/test/validation/api/atomic/Makefile.am index 859e3c51a..4de45970f 100644 --- a/test/validation/api/atomic/Makefile.am +++ b/test/validation/api/atomic/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = atomic_main atomic_main_SOURCES = atomic_main.c atomic.c atomic.h -atomic_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/barrier/Makefile.am b/test/validation/api/barrier/Makefile.am index b0310e3a5..aad5ddd60 100644 --- a/test/validation/api/barrier/Makefile.am +++ b/test/validation/api/barrier/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = barrier_main barrier_main_SOURCES = barrier_main.c barrier.c barrier.h -barrier_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/buffer/Makefile.am b/test/validation/api/buffer/Makefile.am index 59639ff7b..901fdadc7 100644 --- a/test/validation/api/buffer/Makefile.am +++ b/test/validation/api/buffer/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = buffer_main buffer_main_SOURCES = buffer_main.c buffer.c buffer.h -buffer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/chksum/Makefile.am b/test/validation/api/chksum/Makefile.am index 3227294d4..9bd443857 100644 --- a/test/validation/api/chksum/Makefile.am +++ b/test/validation/api/chksum/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = chksum_main chksum_main_SOURCES = chksum_main.c chksum.c chksum.h -chksum_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/classification/Makefile.am b/test/validation/api/classification/Makefile.am index b58703079..303a35767 100644 --- a/test/validation/api/classification/Makefile.am +++ b/test/validation/api/classification/Makefile.am @@ -9,4 +9,3 @@ classification_main_SOURCES = classification_main.c \ odp_classification_common.c \ classification.c \ classification.h -classification_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/cpumask/Makefile.am b/test/validation/api/cpumask/Makefile.am index ff12f56f7..e5c78d924 100644 --- a/test/validation/api/cpumask/Makefile.am +++ b/test/validation/api/cpumask/Makefile.am @@ -2,4 +2,4 @@ include ../Makefile.inc test_PROGRAMS = cpumask_main cpumask_main_SOURCES = cpumask_main.c cpumask.c cpumask.h -cpumask_main_LDADD = $(LIBCPUMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += $(LIBCPUMASK_COMMON) diff --git a/test/validation/api/crypto/Makefile.am b/test/validation/api/crypto/Makefile.am index 94f1c1cae..238ce1892 100644 --- a/test/validation/api/crypto/Makefile.am +++ b/test/validation/api/crypto/Makefile.am @@ -8,4 +8,3 @@ crypto_main_SOURCES = crypto_main.c \ odp_crypto_test_inp.h \ test_vectors.h \ test_vectors_len.h -crypto_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/errno/Makefile.am b/test/validation/api/errno/Makefile.am index 9eddfb482..ad5c7ded4 100644 --- a/test/validation/api/errno/Makefile.am +++ b/test/validation/api/errno/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = errno_main errno_main_SOURCES = errno_main.c errno.c errno.h -errno_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/event/Makefile.am b/test/validation/api/event/Makefile.am index be4764b58..762f93568 100644 --- a/test/validation/api/event/Makefile.am +++ b/test/validation/api/event/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = event_main event_main_SOURCES = event_main.c event.c event.h -event_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/hash/Makefile.am b/test/validation/api/hash/Makefile.am index bd098ffb6..8f0057782 100644 --- a/test/validation/api/hash/Makefile.am +++ b/test/validation/api/hash/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = hash_main hash_main_SOURCES = hash_main.c hash.c hash.h -hash_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/init/Makefile.am b/test/validation/api/init/Makefile.am index 522c3a187..2d0661431 100644 --- a/test/validation/api/init/Makefile.am +++ b/test/validation/api/init/Makefile.am @@ -7,6 +7,3 @@ test_PROGRAMS = init_main_abort init_main_log init_main_ok init_main_abort_SOURCES = init_main_abort.c init.c init.h init_main_log_SOURCES = init_main_log.c init.c init.h init_main_ok_SOURCES = init_main_ok.c init.c init.h -init_main_abort_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) -init_main_log_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) -init_main_ok_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/ipsec/Makefile.am b/test/validation/api/ipsec/Makefile.am index b300c8e88..328826995 100644 --- a/test/validation/api/ipsec/Makefile.am +++ b/test/validation/api/ipsec/Makefile.am @@ -21,7 +21,4 @@ ipsec_async_SOURCES = ipsec_async.c ipsec_inline_in_SOURCES = ipsec_inline_in.c ipsec_inline_out_SOURCES = ipsec_inline_out.c -ipsec_sync_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) -ipsec_async_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) -ipsec_inline_in_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) -ipsec_inline_out_LDADD = libtestipsec.la $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += libtestipsec.la diff --git a/test/validation/api/lock/Makefile.am b/test/validation/api/lock/Makefile.am index b434fe77c..c5518b3a8 100644 --- a/test/validation/api/lock/Makefile.am +++ b/test/validation/api/lock/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = lock_main lock_main_SOURCES = lock_main.c lock.c lock.h -lock_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/packet/Makefile.am b/test/validation/api/packet/Makefile.am index 43300ed0d..d33cdadbd 100644 --- a/test/validation/api/packet/Makefile.am +++ b/test/validation/api/packet/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = packet_main packet_main_SOURCES = packet_main.c packet.c packet.h -packet_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/pktio/Makefile.am b/test/validation/api/pktio/Makefile.am index a416fd1da..a6a16e2f0 100644 --- a/test/validation/api/pktio/Makefile.am +++ b/test/validation/api/pktio/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = pktio_main pktio_main_SOURCES = pktio_main.c parser.c parser.h pktio.c pktio.h -pktio_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/pool/Makefile.am b/test/validation/api/pool/Makefile.am index 9e7c42b51..7951d0484 100644 --- a/test/validation/api/pool/Makefile.am +++ b/test/validation/api/pool/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = pool_main pool_main_SOURCES = pool_main.c pool.c pool.h -pool_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am index 9b1c6b777..5ed4638bc 100644 --- a/test/validation/api/queue/Makefile.am +++ b/test/validation/api/queue/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = queue_main queue_main_SOURCES = queue_main.c queue.c queue.h -queue_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/random/Makefile.am b/test/validation/api/random/Makefile.am index e9e7ffc06..8f1ba9fe0 100644 --- a/test/validation/api/random/Makefile.am +++ b/test/validation/api/random/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = random_main random_main_SOURCES = random_main.c random.c random.h -random_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/scheduler/Makefile.am b/test/validation/api/scheduler/Makefile.am index 34abf7d6a..3673ad7ce 100644 --- a/test/validation/api/scheduler/Makefile.am +++ b/test/validation/api/scheduler/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = scheduler_main scheduler_main_SOURCES = scheduler_main.c scheduler.c scheduler.h -scheduler_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/shmem/Makefile.am b/test/validation/api/shmem/Makefile.am index 8c5d7f700..9a10668f5 100644 --- a/test/validation/api/shmem/Makefile.am +++ b/test/validation/api/shmem/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = shmem_main shmem_main_SOURCES = shmem_main.c shmem.c shmem.h -shmem_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/std_clib/Makefile.am b/test/validation/api/std_clib/Makefile.am index dc75c95cf..34b888bbb 100644 --- a/test/validation/api/std_clib/Makefile.am +++ b/test/validation/api/std_clib/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = std_clib_main std_clib_main_SOURCES = std_clib_main.c std_clib.c std_clib.h -std_clib_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/system/Makefile.am b/test/validation/api/system/Makefile.am index 123d3a693..e6fbb0ea5 100644 --- a/test/validation/api/system/Makefile.am +++ b/test/validation/api/system/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = system_main system_main_SOURCES = system_main.c system.c system.h -system_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/thread/Makefile.am b/test/validation/api/thread/Makefile.am index 1c56574f4..2282169b9 100644 --- a/test/validation/api/thread/Makefile.am +++ b/test/validation/api/thread/Makefile.am @@ -3,4 +3,4 @@ include ../Makefile.inc test_PROGRAMS = thread_main thread_main_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_THRMASK thread_main_SOURCES = thread_main.c thread.c thread.h -thread_main_LDADD = $(LIBTHRMASK_COMMON) $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += $(LIBTHRMASK_COMMON) diff --git a/test/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am index 669d1226b..4c3340e06 100644 --- a/test/validation/api/time/Makefile.am +++ b/test/validation/api/time/Makefile.am @@ -9,7 +9,6 @@ TESTS = $(TESTSCRIPTS) test_PROGRAMS = time_main time_main_SOURCES = time_main.c time.c time_test.h -time_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) dist_check_SCRIPTS = $(TESTSCRIPTS) test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/validation/api/timer/Makefile.am b/test/validation/api/timer/Makefile.am index c953dcb34..576174400 100644 --- a/test/validation/api/timer/Makefile.am +++ b/test/validation/api/timer/Makefile.am @@ -2,4 +2,3 @@ include ../Makefile.inc test_PROGRAMS = timer_main timer_main_SOURCES = timer_main.c timer.c timer.h -timer_main_LDADD = $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/validation/api/traffic_mngr/Makefile.am b/test/validation/api/traffic_mngr/Makefile.am index dc4f87092..82996afe0 100644 --- a/test/validation/api/traffic_mngr/Makefile.am +++ b/test/validation/api/traffic_mngr/Makefile.am @@ -9,7 +9,7 @@ TESTS = $(TESTSCRIPTS) test_PROGRAMS = traffic_mngr_main traffic_mngr_main_SOURCES = traffic_mngr_main.c traffic_mngr.c traffic_mngr.h -traffic_mngr_main_LDADD = -lm $(LIBCUNIT_COMMON) $(LIBODP) +LDADD += -lm dist_check_SCRIPTS = $(TESTSCRIPTS) test_SCRIPTS = $(dist_check_SCRIPTS)