From patchwork Wed Aug 23 14:00:09 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: 110839 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp4169604qge; Wed, 23 Aug 2017 07:01:30 -0700 (PDT) X-Received: by 10.200.43.193 with SMTP id n1mr3549193qtn.272.1503496890458; Wed, 23 Aug 2017 07:01:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503496890; cv=none; d=google.com; s=arc-20160816; b=O23I196wBFAgGO1cKO65X3jBRdVKtR5QCd5ft8/bUjL/yR3CVOtZgOGNZNRvbHk3+W Co9FkrRtzZ3Wa+xsC8t3sUWGG1RpwHSEQLHPr8RrYCDOQy/3DQ2nFEGcsn8s89GGDYHQ 9JHUDBrqsB4cqVQchJHNy62UAw2WSd0V2Qs+Hbva5KfeQzGY49A8kCYbYvr3h8VAtW1Y 6kdi8uhYxvdz270+086Tmcv08RmkOk8VV7y0T0agCq5HRMiqpkRS580WfZB/ZC/d8Dm+ cJrTrIUlNueqgyiG35xr/gvuAzlX1A5gq34OAU9+vlzd+EWDSff3shm3KnOpwScPKRhy ZvmQ== 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=z4VcpcbWPIUIPXmja0H253oHS1soxlVoSYmqIzGYG44=; b=o4mB7i9MjCqbmDUQZPT0ZSLaE2AnGrgD71vG/4HGPQj8kQAGlzhfWICnyTok9cZAGy 6w/7FMS7a2o44t4qaVQLh4KJfWwWIKZJ7vNw53yPLxklBqK32I2GJN9pg+E/CmXOGSyj B4B5TplCIIjS09wkXfmJcev6HIo/wLaTTZh+pEiX3xG9waIhUpcjHgKL6xLz5Zgnz4bV O2AEGAUtbN+y/kVH+kK+zWpMlUzzN4xuXPumNuR3STv1HATUdNXZpT/nMq7Qk+CFMzQA zhu5ESdOQ0jTT8oowb2tqyiFkuYkJevhvZ/FDN/rQ522UfBxJzjLwddSkr0ewl/uCQp2 BKag== 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 z79si1464427qka.31.2017.08.23.07.01.30; Wed, 23 Aug 2017 07:01:30 -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 1541B60870; Wed, 23 Aug 2017 14:01:30 +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 8F52C60D8F; Wed, 23 Aug 2017 14: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 D681060B19; Wed, 23 Aug 2017 14:00:26 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id 9C87F60B19 for ; Wed, 23 Aug 2017 14:00:20 +0000 (UTC) Received: from mxback15g.mail.yandex.net (mxback15g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:94]) by forward101p.mail.yandex.net (Yandex) with ESMTP id 356876A84E4E for ; Wed, 23 Aug 2017 17:00:19 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback15g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 51aoI7J91k-0JV8Wu7J; Wed, 23 Aug 2017 17:00:19 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id VdzcVyVpNx-0IUa6f6R; Wed, 23 Aug 2017 17: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, 23 Aug 2017 17:00:09 +0300 Message-Id: <1503496809-21332-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1503496809-21332-1-git-send-email-odpbot@yandex.ru> References: <1503496809-21332-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 137 Subject: [lng-odp] [PATCH v2] [MONARCH_LTS PATCH v1 1/1] linux-gen: port fix out of tree build commits 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: Maxim Uvarov Combined fix for 2 commits to fix out of tree build. 1. commit 5dd7d9ed05ee ("linux-gen: makefile: fix out of tree build") Author: Petri Savolainen Date: Mon Jun 19 11:25:19 2017 +0300 linux-gen: makefile: fix out of tree build Generated files need $(top_builddir) instead of $(top_srcdir) Fixes bug https://bugs.linaro.org/show_bug.cgi?id=3052 2. b35abec0 (fix out of tree build) Commit: eebd6b0 configure: the version cannot use a script Did generation of version.h which is done in $dest_dir. Includes paths have to be corrected accordingly. Conflicts: example/Makefile.inc helper/Makefile.am platform/Makefile.inc platform/linux-generic/Makefile.am test/Makefile.inc test/platform/linux-generic/Makefile.inc Signed-off-by: Maxim Uvarov --- /** Email created from pull request 137 (muvarov:monarch_lts_fix_out_of_tree_build) ** https://github.com/Linaro/odp/pull/137 ** Patch: https://github.com/Linaro/odp/pull/137.patch ** Base sha: 2dd7893463c2417fec14ff3535e5fe641706cae5 ** Merge commit sha: fe55b4de80551dc47acd6969b06a453412184bee **/ example/Makefile.inc | 4 +++- helper/Makefile.am | 2 ++ platform/Makefile.inc | 4 ++-- platform/linux-generic/Makefile.am | 2 ++ test/Makefile.inc | 8 ++++++-- test/platform/linux-generic/Makefile.inc | 11 +++++++++-- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/example/Makefile.inc b/example/Makefile.inc index 70ba2c0c..19d39943 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -6,6 +6,8 @@ AM_CFLAGS += \ -I$(top_srcdir)/example \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/include/ \ - -I$(top_srcdir)/helper/include + -I$(top_srcdir)/helper/include \ + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_builddir)/include AM_LDFLAGS += -L$(LIB) diff --git a/helper/Makefile.am b/helper/Makefile.am index a82a11aa..d09d9008 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -7,6 +7,8 @@ LIB = $(top_builddir)/lib AM_CFLAGS = -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/include AM_CFLAGS += -I$(top_srcdir)/include +AM_CFLAGS += -I$(top_builddir)/platform/@with_platform@/include +AM_CFLAGS += -I$(top_builddir)/include AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 4a0e68b7..ed618a29 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -57,5 +57,5 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/ticketlock.h \ $(top_srcdir)/include/odp/api/spec/time.h \ $(top_srcdir)/include/odp/api/spec/timer.h \ - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ - $(top_srcdir)/include/odp/api/spec/version.h + $(top_builddir)/include/odp/api/spec/version.h \ + $(top_srcdir)/include/odp/api/spec/traffic_mngr.h diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index c8fd8cbe..000ade5a 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -6,6 +6,8 @@ include $(top_srcdir)/platform/@with_platform@/Makefile.inc AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include +AM_CFLAGS += -I$(top_builddir)/include +AM_CFLAGS += -Iinclude include_HEADERS = \ $(top_srcdir)/include/odp.h \ diff --git a/test/Makefile.inc b/test/Makefile.inc index 5def9235..48323406 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -6,10 +6,14 @@ LIB = $(top_builddir)/lib #before libodp by setting PRE_LDADD before the inclusion. LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la -INCFLAGS = -I$(top_srcdir)/test \ +INCFLAGS = -I$(top_builddir)/include \ + -I$(top_srcdir)/test \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/helper/include + -I$(top_srcdir)/helper/include \ + -I$(top_srcdir)/test \ + -I$(top_srcdir)/test/validation/common + AM_CFLAGS += $(INCFLAGS) AM_CXXFLAGS = $(INCFLAGS) diff --git a/test/platform/linux-generic/Makefile.inc b/test/platform/linux-generic/Makefile.inc index 80b66ae9..57150d22 100644 --- a/test/platform/linux-generic/Makefile.inc +++ b/test/platform/linux-generic/Makefile.inc @@ -8,9 +8,16 @@ LIBCUNIT_COMMON = $(top_builddir)/test/validation/common/libcunit_common.la LIB = $(top_builddir)/lib LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la -INCCUNIT_COMMON = -I$(top_srcdir)/test/validation/common -INCODP = -I$(top_srcdir)/test \ +INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/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)/platform/@with_platform@/arch/$(ARCH_DIR) \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ + -I$(top_srcdir)/test \ + -I$(top_srcdir)/test/validation/common \ -I$(top_srcdir)/include \ -I$(top_srcdir)/helper/include