From patchwork Tue Aug 22 10:00:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 110643 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp5105738obb; Tue, 22 Aug 2017 03:20:19 -0700 (PDT) X-Received: by 10.55.97.200 with SMTP id v191mr170225qkb.169.1503397219784; Tue, 22 Aug 2017 03:20:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503397219; cv=none; d=google.com; s=arc-20160816; b=sxP9XKO/UOtBY7afpJH96UwWZ3LPlU6TMTHdfLKCyz1JHrlLgQhzgtAYWQehtTqWZa djD8LSnheGumtCpcDjl2HFbzSaaQ68XX+xqqQaldbnM20xIsedmwrRVuELCSaX3Ki9Rk A0mUG/B7062mpaE+LOWTqDWqCfaIYP06T1ISjeUVDqIisERrtRs+DNC3xC7P6tiwBn08 1zXbbTWso7MFJKBUOtMfn1yMajnopdYGKVGIa8Ff6lg2AE+6rdFOgjwYJQ9bmtV1Wo/D 8Kplls1ydyt0JF2OAmp4DtaEz6PHkNjVt5O2QPTZae1hLeioWdZq6/bpwr3sv2Gm2pI8 w7uw== 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=DMihvlPi6eN83KWmo71ic3OFzr9ImngFHO3Gt8kpBn4=; b=dhJ+TMN5sStnJYFCMWwc+kv1D2GrHatQKHBnGKz23IDQbvFNDj3240OQFYeAhwiGb3 XrbP33EcvZAkhhHzfYPBhUFWGliylDi1pPmyk+PrMebQhY9PmM2yQpYq/saKoGLNNvx+ 5N8MWJkYTeZbGwxUmAsYM5IcfpN+0s/RbEVdYvcr/nNX+y0O/IJwZT8NNkE1s3xsvzda jESEaJt6I5PEH5+KasioMOUJbFs+iW+rnWDbsi3FTTuZHmyeME7+F85rn/1iDXuyNHoZ 1KqjenGv3iqp3z5UtBoOAmw3hT0+oNlOS5TNojea0QMngsrKA8RqfOMDrPs5KRUo+f2d YlXg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t184si13141201qkc.67.2017.08.22.03.20.18; Tue, 22 Aug 2017 03:20:19 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 1197865BC2; Tue, 22 Aug 2017 10:20:18 +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 E5F3E65C23; Tue, 22 Aug 2017 10:02: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 C21C065C26; Tue, 22 Aug 2017 10:02:20 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id D27B065BBA for ; Tue, 22 Aug 2017 10:00:30 +0000 (UTC) Received: from mxback10g.mail.yandex.net (mxback10g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:171]) by forward104o.mail.yandex.net (Yandex) with ESMTP id 8551B2C84772 for ; Tue, 22 Aug 2017 13:00:28 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback10g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id zCq5UjUu6r-0Sda89Vt; Tue, 22 Aug 2017 13:00:28 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Rlal5nTP8B-0RfGJCJt; Tue, 22 Aug 2017 13:00:27 +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: Tue, 22 Aug 2017 13:00:03 +0300 Message-Id: <1503396009-8350-20-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1503396009-8350-1-git-send-email-odpbot@yandex.ru> References: <1503396009-8350-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 127 Subject: [lng-odp] [PATCH v5 19/25] configure: move nostdinc option to configure.ac 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 It is quite logical to enable nostdinc option non global level instead of defining it only for some of the tests. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 127 (lumag:improve-build) ** https://github.com/Linaro/odp/pull/127 ** Patch: https://github.com/Linaro/odp/pull/127.patch ** Base sha: aecb3c7a442b426761f1e6f43308a1e9ea709ef3 ** Merge commit sha: 86e036501e05c61e5570d0908af382a61c2d4e89 **/ configure.ac | 2 +- platform/linux-generic/arch/x86/cpu_flags.c | 2 +- platform/linux-generic/arch/x86/odp_sysinfo_parse.c | 2 +- test/common_plat/common/odp_cunit_common.c | 2 +- test/common_plat/performance/odp_pktio_ordered.c | 2 +- test/common_plat/validation/api/Makefile.inc | 5 ----- test/linux-generic/ring/Makefile.am | 1 + test/linux-generic/validation/api/shmem/Makefile.am | 1 + 8 files changed, 7 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 4016176b..ac36ee89 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_SUBST(ODP_VERSION_API_MINOR) AC_CONFIG_FILES([include/odp/api/spec/version.h include/odp/api/spec/deprecated.h]) -AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects foreign]) +AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects foreign nostdinc]) AC_CONFIG_SRCDIR([include/odp/api/spec/init.h]) AM_CONFIG_HEADER([include/config.h]) diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c index 690a084e..e46c4ffb 100644 --- a/platform/linux-generic/arch/x86/cpu_flags.c +++ b/platform/linux-generic/arch/x86/cpu_flags.c @@ -39,7 +39,7 @@ #include "config.h" -#include +#include #include #include #include diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c index f4a90ecd..f7918d40 100644 --- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c @@ -7,7 +7,7 @@ #include "config.h" #include -#include +#include #include int cpuinfo_parser(FILE *file, system_info_t *sysinfo) diff --git a/test/common_plat/common/odp_cunit_common.c b/test/common_plat/common/odp_cunit_common.c index a83c3026..08bf1f26 100644 --- a/test/common_plat/common/odp_cunit_common.c +++ b/test/common_plat/common/odp_cunit_common.c @@ -8,7 +8,7 @@ #include #include -#include +#include "odp_cunit_common.h" #include /* Globals */ static odph_odpthread_t thread_tbl[MAX_WORKERS]; diff --git a/test/common_plat/performance/odp_pktio_ordered.c b/test/common_plat/performance/odp_pktio_ordered.c index b08fa852..e772411a 100644 --- a/test/common_plat/performance/odp_pktio_ordered.c +++ b/test/common_plat/performance/odp_pktio_ordered.c @@ -24,7 +24,7 @@ #include #include -#include +#include "dummy_crc.h" #include #include diff --git a/test/common_plat/validation/api/Makefile.inc b/test/common_plat/validation/api/Makefile.inc index 177d2ac3..767526ed 100644 --- a/test/common_plat/validation/api/Makefile.inc +++ b/test/common_plat/validation/api/Makefile.inc @@ -2,11 +2,6 @@ include $(top_srcdir)/test/Makefile.inc COMMON_DIR = $(top_builddir)/test/common_plat/common -#the following option ensure that option '-I.' is not passed to gcc, -#therefore distinguishing between '#include "X"' and '#include '. -#It allows common filenames (such as 'errno.h') to be used locally. -AUTOMAKE_OPTIONS = nostdinc - AM_CFLAGS += -I$(top_srcdir)/test/common_plat/common AM_LDFLAGS += -static AM_LDFLAGS += $(DPDK_PMDS) diff --git a/test/linux-generic/ring/Makefile.am b/test/linux-generic/ring/Makefile.am index c0865848..14f60b85 100644 --- a/test/linux-generic/ring/Makefile.am +++ b/test/linux-generic/ring/Makefile.am @@ -7,6 +7,7 @@ libtestring_la_CFLAGS = $(AM_CFLAGS) $(INCCUNIT_COMMON) $(INCODP) test_PROGRAMS = ring_main$(EXEEXT) dist_ring_main_SOURCES = ring_main.c +ring_main_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/include ring_main_LDFLAGS = $(AM_LDFLAGS) ring_main_LDADD = libtestring.la $(LIBCUNIT_COMMON) $(LIBODP) diff --git a/test/linux-generic/validation/api/shmem/Makefile.am b/test/linux-generic/validation/api/shmem/Makefile.am index b0ae6273..e330d633 100644 --- a/test/linux-generic/validation/api/shmem/Makefile.am +++ b/test/linux-generic/validation/api/shmem/Makefile.am @@ -7,6 +7,7 @@ test_extradir = $(testdir) #shmem_linux is stand alone, pure linux (no ODP): dist_shmem_linux_SOURCES = shmem_linux.c +shmem_linux_CFLAGS = $(AM_CFLAGS) -I$(top_builddir)/include shmem_linux_LDFLAGS = $(AM_LDFLAGS) -lrt #shmem_odp1 and shmem_odp2 are the 2 ODP processes: