From patchwork Thu May 14 11:23:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 48507 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 556E321411 for ; Thu, 14 May 2015 11:24:17 +0000 (UTC) Received: by layy10 with SMTP id y10sf19111678lay.0 for ; Thu, 14 May 2015 04:24:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=nVCPduf3FQTuBYDXuyDctrDSp4bB3ZgTUetSLAs38r8=; b=cvQTap22evt/VeqrrGChhHokNV958tK1kXg79K7oNrEYUW+J6pMIejbNbPTbKGsnOr SZPRVqDDzYsZNv0B91VEuqmmRpCQBz9OcwmW1vI+MTfCdhoKqjFcjFEVM54NninSmcCb 79Y21PxFMyeA97i7wsKUzY5svct5PNNVACgVgv93jKxV7vI8XUh+iAoFVlEmmv65rsHa SdBDr1jce0/LlLUi8y/4w+hDoJ9fBzOy3sYVcsnZI/khYapZTS9EfkWD8xQvRV/kRw2z /xDcoWkcYNbDjBie37a6fXumNyPA6FlTgX9+kvJTfiZyPIyay7v8CHs/YVgMKrD0u1hR c41w== X-Gm-Message-State: ALoCoQkzNI7Hf7Xjc1qZj/YrVdd4olyu5vJOxO4MCN+I/Q9lgfTe5nVa2x+O2eD5C/rNsR/5gm9f X-Received: by 10.112.122.39 with SMTP id lp7mr2722435lbb.5.1431602656190; Thu, 14 May 2015 04:24:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.102 with SMTP id s6ls404831lag.73.gmail; Thu, 14 May 2015 04:24:16 -0700 (PDT) X-Received: by 10.112.154.138 with SMTP id vo10mr2822429lbb.68.1431602656038; Thu, 14 May 2015 04:24:16 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id p5si14330861lah.22.2015.05.14.04.24.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 04:24:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by laat2 with SMTP id t2so62774360laa.1 for ; Thu, 14 May 2015 04:24:16 -0700 (PDT) X-Received: by 10.152.29.161 with SMTP id l1mr2775283lah.76.1431602655928; Thu, 14 May 2015 04:24:15 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1192110lbb; Thu, 14 May 2015 04:24:15 -0700 (PDT) X-Received: by 10.140.19.169 with SMTP id 38mr4467040qgh.75.1431602654526; Thu, 14 May 2015 04:24:14 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id l42si2247612qgl.9.2015.05.14.04.23.53; Thu, 14 May 2015 04:24:14 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Received: by lists.linaro.org (Postfix, from userid 109) id 3F56661F8F; Thu, 14 May 2015 11:23:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252.ec2.internal X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 2089261E5C; Thu, 14 May 2015 11:23:51 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C341B61F89; Thu, 14 May 2015 11:23:49 +0000 (UTC) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com [209.85.215.51]) by lists.linaro.org (Postfix) with ESMTPS id 9F3FE61E5C for ; Thu, 14 May 2015 11:23:48 +0000 (UTC) Received: by lagv1 with SMTP id v1so62717020lag.3 for ; Thu, 14 May 2015 04:23:47 -0700 (PDT) X-Received: by 10.152.243.9 with SMTP id wu9mr2726693lac.63.1431602627503; Thu, 14 May 2015 04:23:47 -0700 (PDT) Received: from localhost.localdomain (ppp91-76-166-40.pppoe.mtu-net.ru. [91.76.166.40]) by mx.google.com with ESMTPSA id r4sm6030680lae.13.2015.05.14.04.23.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 May 2015 04:23:46 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Thu, 14 May 2015 14:23:41 +0300 Message-Id: <1431602621-11255-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [PATCH] linux-generic: compile out helper/linux.c from linux-generic build X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: maxim.uvarov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 ODP helper are function optional used in odp applications. Application has compile helper during it's own build and not expect that odp implementation will have this functions compiled in. Signed-off-by: Maxim Uvarov --- example/classifier/Makefile.am | 2 +- example/generator/Makefile.am | 2 +- example/ipsec/Makefile.am | 3 ++- example/packet/Makefile.am | 2 +- example/timer/Makefile.am | 2 +- platform/linux-generic/Makefile.am | 1 - test/api_test/Makefile.am | 5 ++++- test/performance/Makefile.am | 7 ++++--- test/validation/Makefile.am | 2 +- 9 files changed, 15 insertions(+), 11 deletions(-) diff --git a/example/classifier/Makefile.am b/example/classifier/Makefile.am index 938f094..e1aaacd 100644 --- a/example/classifier/Makefile.am +++ b/example/classifier/Makefile.am @@ -7,4 +7,4 @@ odp_classifier_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example noinst_HEADERS = \ $(top_srcdir)/example/example_debug.h -dist_odp_classifier_SOURCES = odp_classifier.c +dist_odp_classifier_SOURCES = odp_classifier.c ../../helper/linux.c diff --git a/example/generator/Makefile.am b/example/generator/Makefile.am index fcb5965..8ebea1c 100644 --- a/example/generator/Makefile.am +++ b/example/generator/Makefile.am @@ -7,4 +7,4 @@ odp_generator_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example noinst_HEADERS = \ $(top_srcdir)/example/example_debug.h -dist_odp_generator_SOURCES = odp_generator.c +dist_odp_generator_SOURCES = odp_generator.c ../../helper/linux.c diff --git a/example/ipsec/Makefile.am b/example/ipsec/Makefile.am index 0194f1b..985d465 100644 --- a/example/ipsec/Makefile.am +++ b/example/ipsec/Makefile.am @@ -31,4 +31,5 @@ dist_odp_ipsec_SOURCES = odp_ipsec.c \ odp_ipsec_fwd_db.c \ odp_ipsec_loop_db.c \ odp_ipsec_cache.c \ - odp_ipsec_stream.c + odp_ipsec_stream.c \ + ../../helper/linux.c diff --git a/example/packet/Makefile.am b/example/packet/Makefile.am index a36e29a..e916288 100644 --- a/example/packet/Makefile.am +++ b/example/packet/Makefile.am @@ -7,4 +7,4 @@ odp_pktio_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example noinst_HEADERS = \ $(top_srcdir)/example/example_debug.h -dist_odp_pktio_SOURCES = odp_pktio.c +dist_odp_pktio_SOURCES = odp_pktio.c ../../helper/linux.c diff --git a/example/timer/Makefile.am b/example/timer/Makefile.am index 04d51c4..afc6069 100644 --- a/example/timer/Makefile.am +++ b/example/timer/Makefile.am @@ -7,4 +7,4 @@ odp_timer_test_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example noinst_HEADERS = \ $(top_srcdir)/example/example_debug.h -dist_odp_timer_test_SOURCES = odp_timer_test.c +dist_odp_timer_test_SOURCES = odp_timer_test.c ../../helper/linux.c diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 66f0474..3cbde7d 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -151,7 +151,6 @@ __LIB__libodp_la_SOURCES = \ odp_event.c \ odp_init.c \ odp_impl.c \ - ../../helper/linux.c \ odp_packet.c \ odp_packet_flags.c \ odp_packet_io.c \ diff --git a/test/api_test/Makefile.am b/test/api_test/Makefile.am index ddbac53..a08af82 100644 --- a/test/api_test/Makefile.am +++ b/test/api_test/Makefile.am @@ -10,4 +10,7 @@ noinst_HEADERS = \ $(top_srcdir)/test/api_test/odp_common.h \ $(top_srcdir)/test/test_debug.h -dist_odp_ring_SOURCES = odp_ring_test.c odp_common.c +dist_odp_ring_SOURCES = odp_ring_test.c \ + odp_common.c \ + ../../helper/linux.c \ + ../../helper/ring.c diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am index f128756..69b15c8 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -24,6 +24,7 @@ odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test noinst_HEADERS = \ $(top_srcdir)/test/test_debug.h -dist_odp_atomic_SOURCES = odp_atomic.c -dist_odp_scheduling_SOURCES = odp_scheduling.c -dist_odp_pktio_perf_SOURCES = odp_pktio_perf.c +dist_odp_atomic_SOURCES = odp_atomic.c ../../helper/linux.c +dist_odp_scheduling_SOURCES = odp_scheduling.c ../../helper/linux.c +dist_odp_pktio_perf_SOURCES = odp_pktio_perf.c ../../helper/linux.c +dist_odp_l2fwd_SOURCES = odp_l2fwd.c ../../helper/linux.c diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 7470d9d..960ade0 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -36,7 +36,7 @@ dist_bin_SCRIPTS = odp_pktio_run bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) -ODP_CU_COMMON=common/odp_cunit_common.c +ODP_CU_COMMON=common/odp_cunit_common.c ../../helper/linux.c odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer dist_odp_buffer_SOURCES = odp_buffer.c $(ODP_CU_COMMON)