From patchwork Wed Jan 24 02: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: 125612 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp116198ljf; Tue, 23 Jan 2018 18:01:02 -0800 (PST) X-Google-Smtp-Source: AH8x225uyi/qLY/rRstCFvvl7XJm4uUJ+S851J7zWGrlaaI7GMmJIXzekOTUVHA5Y975YQ/zOWU7 X-Received: by 10.200.64.90 with SMTP id j26mr7131471qtl.29.1516759262444; Tue, 23 Jan 2018 18:01:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516759262; cv=none; d=google.com; s=arc-20160816; b=PP2aUef3+xvnbRYrjECRRH3vGeMDpg4Tp8YHsSHwPsKTkCNCA32S9A6OthkmLd+QNe fCNCSoDpVIz4Fg1nOm6dwGbHPlAKmmu3JbZklx0k8xEx2ZIQFko9IE4xmjLElTLgu3sx BScweo826ZyjynY7gR5bcKGX1my4A0sMhIV+HgqwDS5cLc22f19+AxsNRlMSIvREAIsu BnX60OXLomKWWhTjchiQyudrBhQ/kgIs+3yngsDuv+jr3s/2nWfWwqjW/gGAnbCnP6dk kz90hg5z0999d/LLcwSgQafEhYgALq5VmcEkjMSk5YUGnZrMt+nkzb0N61f7N3i1zmY1 8KwQ== 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=Mf+YNKuUeJSwmcppgalXE060AwcvppLeGLxR46ixMZY=; b=UrjF01cnUE7BTPq/0INDKiGbPT5amWwYBRzy2fZCOSauPO9+4THqTfqziT2kaxhii6 mLcI6d6FKh+OFWJd5iqxrBec2Y6B0EmlSxYs6TN08qMspdiQSaZBkfGhMkFTwJaqmvv6 0uR+qjFDGuTSp1pvWpIpcufaOuBqjpRt+dHJppXetZQoLTvLXokjlNPeisFXC9yDMjsE gm5J+/rJp2ZN5w/ho4nalsVE1/BRVxBz8eIr6s5/ZUIdqIMwSQCTDk8YNOtUAodk/juP FA92Kgvq8o5n3pnRwSh7gtebM+U/Q2JoHVXUjyubaYwazD/dAtRHO3SAt8dvn1ZCQJGw PC/Q== 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 q30si1653490qte.351.2018.01.23.18.01.02; Tue, 23 Jan 2018 18:01:02 -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 1E55C617F3; Wed, 24 Jan 2018 02:01:02 +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 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 5161D6175F; Wed, 24 Jan 2018 02: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 6014161520; Wed, 24 Jan 2018 02:00:19 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id 872E660974 for ; Wed, 24 Jan 2018 02:00:17 +0000 (UTC) Received: from mxback2o.mail.yandex.net (mxback2o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1c]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 3D2372182BFD for ; Wed, 24 Jan 2018 05:00:16 +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 DsSQFQ2MH3-0GtO8NSb; Wed, 24 Jan 2018 05:00:16 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Eede1EXMx1-0FN8w0IO; Wed, 24 Jan 2018 05: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, 24 Jan 2018 05:00:08 +0300 Message-Id: <1516759212-29210-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516759212-29210-1-git-send-email-odpbot@yandex.ru> References: <1516759212-29210-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 416 Subject: [lng-odp] [PATCH v3 1/5] build: odp_dpdk: another fix for 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 Older toolchains won't include all shared objects from the group so file to DT_NEEDED section. So use --as-needed/--no-as-needed flags to control linking with DPDK PMD libs. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 416 (lumag:trav-dpdk-shared) ** https://github.com/Linaro/odp/pull/416 ** Patch: https://github.com/Linaro/odp/pull/416.patch ** Base sha: b122176ee59494dd957f0f5ff41d4b55a1477e13 ** Merge commit sha: eda6bc11b0fade6a40b217608359775c2c7043f8 **/ m4/odp_dpdk.m4 | 21 +++++++++++++++------ platform/linux-generic/Makefile.am | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 1887b0431..81ace08a9 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -17,18 +17,29 @@ AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) # _ODP_DPDK_SET_LIBS # -------------------- -# Set DPDK_LIBS/DPDK_LIBS_LT depending on DPDK setup +# Set DPDK_LIBS/DPDK_LIBS_LT/DPDK_LIBS_LIBODP depending on DPDK setup AC_DEFUN([_ODP_DPDK_SET_LIBS], [dnl AS_IF([test "x$DPDK_SHARED" = "xyes"], [dnl - DPDK_LIBS_LT="" + # applications don't need to be linked to anything, just rpath + DPDK_LIBS_LT="$DPDK_RPATH_LT" + # static linking flags will need -ldpdk + DPDK_LIBS="-Wl,--no-as-needed,-ldpdk,--as-needed,`echo $DPDK_LIBS | sed -e 's/ /,/g'`" DPDK_LIBS="$DPDK_LDFLAGS $DPDK_RPATH $DPDK_LIBS" + # link libodp-linux with -ldpdk + DPDK_LIBS_LIBODP="$DPDK_LIBS" ], [dnl ODP_DPDK_PMDS([$DPDK_PMD_PATH]) + # build long list of libraries for applications, which should not be + # rearranged by libtool 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" + # static linking flags follow the suite DPDK_LIBS="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS" + # link libodp-linux with libtool linking flags + DPDK_LIBS_LIBODP="$DPDK_LIBS_LT" ]) AC_SUBST([DPDK_LIBS]) +AC_SUBST([DPDK_LIBS_LIBODP]) AC_SUBST([DPDK_LIBS_LT]) ]) @@ -99,7 +110,6 @@ 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`" @@ -115,10 +125,9 @@ AS_IF([test "x$1" = "xsystem"], [dnl 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_RPATH="-Wl,-rpath,$DPDK_LIB_PATH" + DPDK_RPATH_LT="-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 8585080df..3e38489f6 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -272,7 +272,7 @@ endif __LIB__libodp_linux_la_LIBADD = $(ATOMIC_LIBS) __LIB__libodp_linux_la_LIBADD += $(OPENSSL_LIBS) -__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS_LT) +__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS_LIBODP) __LIB__libodp_linux_la_LIBADD += $(PTHREAD_LIBS) __LIB__libodp_linux_la_LIBADD += $(TIMER_LIBS) From patchwork Wed Jan 24 02: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: 125613 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp116530ljf; Tue, 23 Jan 2018 18:01:39 -0800 (PST) X-Google-Smtp-Source: AH8x2243YJf3/mUWSp5g7INrdXkDn2M5zU3vWBteDo+S7FPoOmpvo/xKbwLT6N1Rdx+W/slFixtx X-Received: by 10.55.101.215 with SMTP id z206mr6643181qkb.62.1516759298987; Tue, 23 Jan 2018 18:01:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516759298; cv=none; d=google.com; s=arc-20160816; b=TougU2qCqtG7r3TahPPaY2wpEyGZ2GnmTXva877a932KTp3wvsQXlzjV3OElSZwGAX mei+/f7gtF+IM1byGGEVJn6ZfbYQb/GkhfRMA3PaL8AZG07DsVnqFA2LJEpCperps+tZ MFZRlds5B3Yy95omaix+MLh5EA8NqM94svJ/G4mnxaBRH+reiPUW0mBCSG9jbMkjVwXi o0AF+c90NQR+hcY3cZpuHgY8G6EiS45VzO4TAukcHtQFQstKG18uincXc3uomo1+AB2T dWNJMp34BrYvdtS3AW8lLsvEspAh/oBckXRpcSqsvB2+rck8QnNNBSQKFZNHd77AUPQy e9SA== 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=l2FH5XAtxh7JPjU1uDBpoz6gtqxmH2w2kf8CwxJPYUc=; b=xGMHOZtKQWambJCRMHM3yPkPCuiUh77ZqPFK7M1yu0BHRfm/bcYVAqhaL0sGENWBmf mCaVSXlTWP76W3EjTTSLURU+l87OBWuZuKAh/ulUY+n+fa+oi8DBEIy0m6hUux5ys4Jj a3viO+46gibjA307RSvXweqeKJ0ablt1B7YfbZt80JHzvwSlfpqVczAH8pAGY7mR+r7N EBxCAhqvLBaAKTdVPyyupSWA8OSyX48uW5ysdI/uajBAPXBLwUFTsPb5UwVM84AOLDsn m2Kwffwk5LY5UmvOl4k5SmSQUdBI6aNtZZIU3xacNXGVTR1GiI8YRnW8d0gQ4jHsIPZI N55w== 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 h197si8636711qke.105.2018.01.23.18.01.38; Tue, 23 Jan 2018 18:01:38 -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 AC9D8617E0; Wed, 24 Jan 2018 02:01: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 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 A79B6617B3; Wed, 24 Jan 2018 02:00:28 +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 6C448616F4; Wed, 24 Jan 2018 02:00:20 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 8981660861 for ; Wed, 24 Jan 2018 02:00:18 +0000 (UTC) Received: from mxback5g.mail.yandex.net (mxback5g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:166]) by forward102j.mail.yandex.net (Yandex) with ESMTP id BEF3456045E5 for ; Wed, 24 Jan 2018 05:00:16 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback5g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id LUqj8n5Jf8-0GMSWlKW; Wed, 24 Jan 2018 05:00:16 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Eede1EXMx1-0GNW5Uno; Wed, 24 Jan 2018 05: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, 24 Jan 2018 05:00:09 +0300 Message-Id: <1516759212-29210-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516759212-29210-1-git-send-email-odpbot@yandex.ru> References: <1516759212-29210-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 416 Subject: [lng-odp] [PATCH v3 2/5] build: odp_dpdk: print info on detected DPDK type and location 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 416 (lumag:trav-dpdk-shared) ** https://github.com/Linaro/odp/pull/416 ** Patch: https://github.com/Linaro/odp/pull/416.patch ** Base sha: b122176ee59494dd957f0f5ff41d4b55a1477e13 ** Merge commit sha: eda6bc11b0fade6a40b217608359775c2c7043f8 **/ m4/odp_dpdk.m4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 81ace08a9..bf3dfccfa 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -130,5 +130,8 @@ AS_IF([test "x$1" = "xsystem"], [dnl DPDK_SHARED=yes fi ]) +AS_IF([test "x$DPDK_SHARED" = "xyes"], + [AC_MSG_NOTICE([Using shared DPDK library found at $DPDK_PMD_PATH])], + [AC_MSG_NOTICE([Using static DPDK library found at $DPDK_PMD_PATH])]) _ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [$2], [$3]) ]) From patchwork Wed Jan 24 02:00:10 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: 125616 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp117678ljf; Tue, 23 Jan 2018 18:04:15 -0800 (PST) X-Google-Smtp-Source: AH8x226swzrqFyKxZ22g3rnMd7BnWf2tYdVwZOlSedyYzVi2AH/PKk1xf8s3rRQxSFX61Fayk2S3 X-Received: by 10.200.26.206 with SMTP id h14mr6755987qtk.223.1516759454881; Tue, 23 Jan 2018 18:04:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516759454; cv=none; d=google.com; s=arc-20160816; b=DHWSy9soEsfyaGVsx1slYBLiGjFB6xEcViNXKghbPo6NASMdiSCmAsiWLTIGmCtPnb JeBJoCO/0m1PoSfENdCAIBpxC/cnwEYLZePM38ofRNLvkLh/EQKmaRePrc16M3lazIMd hyPIR6awwjHmkjE9+HfBIDDVkf0KppIZXTLz7rRPW6bvUJoOp+Livf85NZI6o2H6c9p/ qjOVNnSbJBz2Mr8G2h5BQEMhSKX7w4lJltA1VWsARJ6yIeI7Syig60yIylEAq+RsW2XD 83EsNeaHbp3wjAxxFepY+JgcOyNgeMk7S1inycBI6wtM58T+nCFKliEqxzoJSwtWL54D kD8g== 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=bhMDgK9t70J6ybdH3SXPTk5QUhct6B8mvAxKDw2GFO8=; b=lNaHJEu2/9ama75eVDrbWa5BjC9wy7f40SCxq97q2mQUtpBydY5LBKho7oYZNcEfMd jgivASFEIk3nultX8wtgngytiNlVByN1P+hmVo2ir6ucfbguFeZNdPcZSrqYmlFFK9D2 IL2/n3EYGh25+KVcKsOHC91/aI/eOA0n4pg/1HlVO7a75x0mB8LzA3hKriRkX9qBoWsd yy5geqXhfhzKlNZsQfwU454Kx/UoW0Au5A5pEXMKGG/DMX2o5So6ipnGMKl9SurZXIxt rx37zAm8HrcVg+f3w2yKcxxnpTpS9znX9sE+6/GnPzh/o3TKt/g1CUAPJmZltt9SPmTE gU3Q== 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 v54si1767823qtk.290.2018.01.23.18.04.14; Tue, 23 Jan 2018 18:04:14 -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 6C7C3617E5; Wed, 24 Jan 2018 02:04:14 +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 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 4969B6177D; Wed, 24 Jan 2018 02:02:04 +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 1A06561520; Wed, 24 Jan 2018 02:01:59 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id 5B06D61520 for ; Wed, 24 Jan 2018 02:00:50 +0000 (UTC) Received: from mxback8g.mail.yandex.net (mxback8g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:169]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 5B69B13418F1 for ; Wed, 24 Jan 2018 05:00:17 +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 Fhy57kOXRF-0Ht08c1X; Wed, 24 Jan 2018 05:00:17 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Eede1EXMx1-0GNui4b9; Wed, 24 Jan 2018 05: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, 24 Jan 2018 05:00:10 +0300 Message-Id: <1516759212-29210-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516759212-29210-1-git-send-email-odpbot@yandex.ru> References: <1516759212-29210-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 416 Subject: [lng-odp] [PATCH v3 3/5] build: configure: print notice about unsupported configuration 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 If we are using shared DPDK library, we can not guarantee that there will be a static one (to fullfill dependencies if gcc -static is used). Thus mark this configuration as not supported. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 416 (lumag:trav-dpdk-shared) ** https://github.com/Linaro/odp/pull/416 ** Patch: https://github.com/Linaro/odp/pull/416.patch ** Base sha: b122176ee59494dd957f0f5ff41d4b55a1477e13 ** Merge commit sha: eda6bc11b0fade6a40b217608359775c2c7043f8 **/ configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index 56a422b4b..6d76bead8 100644 --- a/configure.ac +++ b/configure.ac @@ -191,6 +191,12 @@ AC_ARG_ENABLE([static-applications], [ with ODP])], [], [enable_static_applications=yes]) AM_CONDITIONAL([STATIC_APPS], [test "x$enable_static_applications" != "xno"]) +if test "x$DPDK_SHARED" = "xyes" -a "x$enable_static_applications" != "xno" ; +then + AC_MSG_WARN([Static linking of examples and tests might fail when ] + [shared DPDK is detected. If build fails please retry with ] + [--disable-static-applications]) +fi ########################################################################## # Include m4 files From patchwork Wed Jan 24 02:00:11 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: 125614 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp116796ljf; Tue, 23 Jan 2018 18:02:15 -0800 (PST) X-Google-Smtp-Source: AH8x226ugGTMZZLfPejbd5JEBxwfH/P1zglDHpsYntrbrcEI6zSCnI+aY5jAzfHFKHKSugwCVFox X-Received: by 10.55.185.134 with SMTP id j128mr3967695qkf.341.1516759335085; Tue, 23 Jan 2018 18:02:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516759335; cv=none; d=google.com; s=arc-20160816; b=b7QkQY633QooleObkjUzuLMr4PfAN5TEpD3y0b7ThhlFAn1sFtdpibNBRz1gWYBlWx Ul0+TEya2qm6xz4L8EsFx4x/yaOoDYFtheVzf9ANsQYng6nf/yTDOStt4pcD8KSDPAfd WVFaGYH2RwC+YMvgUMyfLA7p+wc0D8p2jbKAyZhk/4ObVgIb8uDUTfcCaxnA92DWKZXn 2H9EE8GIsSsHqK4fQcmTynsyk5gtMau4EWUrGy8UfYi1bQm101T/unitpJuOxwVGAEWN JbhR7Z4iYRuLLgsZXgxyIgtzY3Lmm2WUp1P4mHNkCOm4S2WyufuUWFlElpLm0CD7Cbzw 4a/Q== 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=kz4A9CZ3hyQQZdKAnPb3hLlyb1gpSDsKYVyqRr/vfMM=; b=TNGseC8vp1m+wGsnJ1abprpQCeL0WzLxy+n+fHQRQ21Zqj5wMJvchvViSPxg5B6JNY 21PscQNGZmaS649F9ZoUNtEaPATCXuNUG/y2WvRdVF8SoCptRBfYTPPQ1G/qk1H+DV1x PFFOsCfE9neKje/SOghjit2+A2MSk31vk1rXkAjixjAGzMYedfmjQcP3G6WBsD/D5t+o mVVlSRa2bGMdJS2ClyOPvee/VDI2lqZW3i1hgA+lZMPzY4AhPBofZ8Bm/vrl1fWS+lbv ktj/fvWZ/2caJQwAJ5CVLsISOhKgnaIZWAd3EG9Z4VH0e/uPSSavVci9Fg+ggu5eRRjw 8IJQ== 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 p5si1759769qtf.17.2018.01.23.18.02.14; Tue, 23 Jan 2018 18:02:15 -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 BEC1F617E0; Wed, 24 Jan 2018 02:02:14 +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 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 E4D80617E4; Wed, 24 Jan 2018 02:00:31 +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 CDF6161520; Wed, 24 Jan 2018 02:00:21 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id 91B1D60974 for ; Wed, 24 Jan 2018 02:00:19 +0000 (UTC) Received: from mxback10o.mail.yandex.net (mxback10o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::24]) by forward100o.mail.yandex.net (Yandex) with ESMTP id D650A2A23846 for ; Wed, 24 Jan 2018 05:00:17 +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 ntyp71qWp9-0H9udAvW; Wed, 24 Jan 2018 05:00:17 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Eede1EXMx1-0HNWtcT5; Wed, 24 Jan 2018 05: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, 24 Jan 2018 05:00:11 +0300 Message-Id: <1516759212-29210-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516759212-29210-1-git-send-email-odpbot@yandex.ru> References: <1516759212-29210-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 416 Subject: [lng-odp] [PATCH v3 4/5] travis: merge variable sections 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 Travis ignores first env setting once it encountered second one. Merge them together. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 416 (lumag:trav-dpdk-shared) ** https://github.com/Linaro/odp/pull/416 ** Patch: https://github.com/Linaro/odp/pull/416.patch ** Base sha: b122176ee59494dd957f0f5ff41d4b55a1477e13 ** Merge commit sha: eda6bc11b0fade6a40b217608359775c2c7043f8 **/ .travis.yml | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index fca06a0d2..98d0b0115 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,27 +15,6 @@ stages: - "build only" - test env: - global: - # COVERITY_SCAN_TOKEN - # ** specific to your project ** - # Note: - # You should have a github account and travis linked travis account. - # The secure key to be filled below is the 685 character long encrypted - # token you can find as follow from your coverity dashboard - # (at https://scan.coverity.com/dashboard): - # Click on the github project (/odp) - # Click on "submit build" - # Click on "Configure Travis CI" - # Look at the COVERITY_SCAN_TOKEN in the env: global: section - # of the configuration example. - # copy the secure: below - # - - secure: "xxxx" - # - # By default Linaro CODECOV_TOKEN token is used. It's ok to use it to see - # for individual commit validation. But you you want to track tests history - # you need generated new one at https://codecov.io specific for your repo. - - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e addons: apt: @@ -53,10 +32,6 @@ addons: # build_command: "make" # branch_pattern: coverity_scan -compiler: - - gcc - - clang-3.8 - cache: ccache: true pip: true @@ -67,6 +42,13 @@ cache: - $HOME/doxygen-install env: + global: + # + # By default Linaro CODECOV_TOKEN token is used. It's ok to use it to see + # for individual commit validation. But you you want to track tests history + # you need generated new one at https://codecov.io specific for your repo. + - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e + matrix: - CONF="" - CONF="--disable-abi-compat" - CONF="--enable-deprecated" @@ -84,6 +66,10 @@ env: - CROSS_ARCH="powerpc" CONF="--disable-abi-compat" - CROSS_ARCH="i386" CONF="--disable-abi-compat" +compiler: + - gcc + - clang-3.8 + before_install: # Install cross toolchains, etc From patchwork Wed Jan 24 02:00:12 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: 125615 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp117171ljf; Tue, 23 Jan 2018 18:03:02 -0800 (PST) X-Google-Smtp-Source: AH8x227Mhn4sb6/6zqHbB3PoMlnlSSdYMrnbWZslr5qmYbySFR06Pfq6mYzIpy2rL+0eRdPYztb5 X-Received: by 10.200.12.78 with SMTP id l14mr7120480qti.291.1516759381897; Tue, 23 Jan 2018 18:03:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516759381; cv=none; d=google.com; s=arc-20160816; b=pVMFFGdX31ba1EB61IpH1pgrJW6NDhbqQL5QQKA8Phri7SgWzrvMqTyR7kR85ERK1A sEHFLT6ffeTxA4rtSdPE0l+CiWqVwxgLlhBOWVDU4/degXTcdfyXBrWyYEVpZlmkrlr5 foyCwnxcojTA1g2sSZX/CR35rzJNx4paoZbcdotlrul4cTPliVredIBT8XOpE/uZCiq6 U9nhE6Htb3yjn5KGx8arjm+kqNV/Xt9sOT5a86McS+1iVmxrqYy5mPUVsEDqZciBB20/ QRcuNhC8VBJexJli7R0FgCkx+Cg8OWdGb3ih+XnRmlMkU/1S5UNaB2WVYk051WAj7mSr gLXg== 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=ijjjtrkUbn+eEJ/e+W/hrUJ6gPcCJ8MLWO3THBTD5WQ=; b=xoTR0zRFvOPZmJ91pDMPCl9pzFe6+wS+0gEW4cp5tiorVDXgvCAjZzD6kE0xjJUdxk fIWIL4vDBi5MMfZn/7i8klabC3c4WUSmx+H6M9Gslw7bYLbJczDc+rDO+YW7NcHZqSVv p+1tx8GLXU45F/EIMCAkWR/r1N6S7WbYpguBdn7uNZpLoCkwVV82s50r3br6AHeiu5fp TEQ3zuITOkKMM+AERrmmw/Z5/4yJgnuL6mLS+rtvuxtOCsUK2X2zhaNn4FfChU36P6zE bESSTAUbIOuQ1dfDpUfVUFXQb1dkKla6FwuGu8kHIpT3gSPnUlpluBg5YXba3WrCckhb 8PxA== 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 m15si1745513qti.431.2018.01.23.18.03.01; Tue, 23 Jan 2018 18:03:01 -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 92C62617E5; Wed, 24 Jan 2018 02:03:01 +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 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 3473B617E8; Wed, 24 Jan 2018 02:00:36 +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 ED0D66171F; Wed, 24 Jan 2018 02:00:23 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id D8E9861506 for ; Wed, 24 Jan 2018 02:00:19 +0000 (UTC) Received: from mxback10j.mail.yandex.net (mxback10j.mail.yandex.net [IPv6:2a02:6b8:0:1619::113]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 82C9534C43C5 for ; Wed, 24 Jan 2018 05:00:18 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback10j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ENSsvWk0r0-0IROb5ES; Wed, 24 Jan 2018 05:00:18 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Eede1EXMx1-0HNeVRFp; Wed, 24 Jan 2018 05: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, 24 Jan 2018 05:00:12 +0300 Message-Id: <1516759212-29210-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516759212-29210-1-git-send-email-odpbot@yandex.ru> References: <1516759212-29210-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 416 Subject: [lng-odp] [PATCH v3 5/5] travis: test ODP with shared DPDK 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 Add testcase compiling and running ODP with shared DPDK lib Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 416 (lumag:trav-dpdk-shared) ** https://github.com/Linaro/odp/pull/416 ** Patch: https://github.com/Linaro/odp/pull/416.patch ** Base sha: b122176ee59494dd957f0f5ff41d4b55a1477e13 ** Merge commit sha: eda6bc11b0fade6a40b217608359775c2c7043f8 **/ .travis.yml | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 98d0b0115..7dd7522da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ group: deprecated-2017Q2 stages: - "build only" - test -env: addons: apt: @@ -48,6 +47,7 @@ env: # for individual commit validation. But you you want to track tests history # you need generated new one at https://codecov.io specific for your repo. - CODECOV_TOKEN=a733c34c-5f5c-4ff1-af4b-e9f5edb1ab5e + - DPDK_VERS="17.08" matrix: - CONF="" - CONF="--disable-abi-compat" @@ -57,6 +57,7 @@ env: - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" - CONF="--disable-static-applications" + - DPDK_SHARED="y" CONF="--disable-static-applications" - CROSS_ARCH="arm64" - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - CROSS_ARCH="powerpc" @@ -160,7 +161,6 @@ install: - gem install asciidoctor # DPDK pktio. Note that cache must be purged if dpdk version changes. - - DPDK_VERS="17.08" - | CACHED_DPDK_VERS=`fgrep Version dpdk/pkg/dpdk.spec | cut -d " " -f 2` if [ "${CACHED_DPDK_VERS}" != "${DPDK_VERS}" ]; then @@ -169,43 +169,53 @@ install: - | case "$CROSS_ARCH" in "arm64") - TARGET="arm64-armv8a-linuxapp-gcc" + DPDK_TARGET="arm64-armv8a-linuxapp-gcc" ;; "armhf") - TARGET="arm-armv7a-linuxapp-gcc" + DPDK_TARGET="arm-armv7a-linuxapp-gcc" ;; "i386") - TARGET="i686-native-linuxapp-gcc" + DPDK_TARGET="i686-native-linuxapp-gcc" ;; "") - TARGET="x86_64-native-linuxapp-gcc" + DPDK_TARGET="x86_64-native-linuxapp-gcc" DPDK_MACHINE=snb ;; esac - | - if [ -n "$TARGET" ] ; then - if [ ! -f "dpdk/${TARGET}/lib/libdpdk.a" ] ; then + if [ -n "$DPDK_TARGET" ] ; then + if [ -n "$DPDK_SHARED" ] ; then + TARGET="$DPDK_TARGET"-shared + LIBDPDKEXT=so + export LD_LIBRARY_PATH="`pwd`/${TARGET}:$LD_LIBRARY_PATH" + echo $LD_LIBRARY_PATH + else + TARGET="$DPDK_TARGET" + LIBDPDKEXT=a + fi + if [ ! -f "dpdk/${TARGET}/lib/libdpdk.$LIBDPDKEXT" ]; then git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v${DPDK_VERS} http://dpdk.org/git/dpdk dpdk pushd dpdk git log --oneline --decorate - echo $CC # AArch64 && ARMv7 fixup sed -i -e 's/40900/40800/g' lib/librte_eal/common/include/arch/arm/rte_vect.h sed -i -e 's/!(/!(defined(__arm__) \&\& defined(__clang__) || /g' lib/librte_eal/common/include/arch/arm/rte_byteorder.h sed -i -e 's/__GNUC__/defined(__arm__) \&\& defined(__clang__) || __GNUC__/' lib/librte_eal/common/include/generic/rte_byteorder.h - make config T=${TARGET} O=${TARGET} + make config T=${DPDK_TARGET} O=${TARGET} pushd ${TARGET} sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config - cat .config |grep RTE_MACHINE if test -n "${DPDK_MACHINE}" ; then sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"'${DPDK_MACHINE}'",' .config fi + if test -n "${DPDK_SHARED}" ; then + sed -ri 's,(CONFIG_RTE_BUILD_SHARED_LIB=).*,\1y,' .config + fi if test -n "$CROSS_ARCH" ; then sed -ri -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1n,' .config sed -ri -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' .config fi popd - make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" -j $(nproc) + make build T=${DPDK_TARGET} O=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" -j $(nproc) rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd fi @@ -244,11 +254,17 @@ script: - pushd $HOME - echo "Dynamic link.." - ${CC} ${CFLAGS} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst_dynamic `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux` - - echo "Static link.." - - ${CC} ${CFLAGS} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst_static `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux --static` -static - if [ -z "$CROSS_ARCH" ] ; then - LD_LIBRARY_PATH="${HOME}/odp-install/lib:$LD_LIBRARY_PATH" ./odp_hello_inst_dynamic ; - ./odp_hello_inst_static ; + LD_LIBRARY_PATH="${HOME}/odp-install/lib:$LD_LIBRARY_PATH" ./odp_hello_inst_dynamic ; + fi + - | + # it is not possible to do static linking if we only have shared DPDK library. Compiler complains about missing -ldpdk + if [ -z "$TARGET" -o -z "$DPDK_SHARED" ] ; then + echo "Static link.." + ${CC} ${CFLAGS} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst_static `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux --static` -static || exit 1 + if [ -z "$CROSS_ARCH" ] ; then + ./odp_hello_inst_static; + fi fi - popd - ccache -s