From patchwork Thu Jan 18 05: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: 124917 Delivered-To: patch@linaro.org Received: by 10.46.62.1 with SMTP id l1csp313541lja; Wed, 17 Jan 2018 21:02:11 -0800 (PST) X-Google-Smtp-Source: ACJfBou9OMzp5zdqs4UU37g1kqgJMGlUS09fdDca+Tneq84BQCYnJbBPM1PMsVfHM8Cd2MSLoKhQ X-Received: by 10.200.44.34 with SMTP id d31mr14012216qta.14.1516251731418; Wed, 17 Jan 2018 21:02:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516251731; cv=none; d=google.com; s=arc-20160816; b=EkzKTVQq9w2WyBQITrwGQrzFbulLj9h3qW5owphY4nu50Hhsm4RtpXMzya/7W3+c0p axEY03wTuRA6xWIvKaQlxQOX9NdGgg3QeeR2IPIKhhEmNl4KAjfUG5iOeguwTO94UX1F g6ncZv4KbHJhIOxOqgtxe8bAuTh9p5PFQP7OHvul6xxykn7zXbuJw9e0vQelEl87g3y1 u2OQ9xl5ceD/GTEXi1XSfI2fDyLowIIw+MfUasXj2SGhNrouYESEyP0eKEp3C5G3iIB2 Abytf2nUw6xe4qkqVO8+utMKTfbnqxQi596/n9Cnn/3d/GTMVmA5ULSMS/OgvKx1sZ2E crTQ== 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=KiXVlCJPIal7fRbaiBeEazOlep8xpB8mOUQMncGP/xQ=; b=cP8SVN2/cPvbWzsTjZEgdoeQmqeTMANPBtBOwmSuzhDHBP36svDVIW8gfxqAo81WhC B0E4YS11z78rxM46U1oU1fzXaF5ovCIqwdVpWI+yaoVpnTuF0vRyKXuq5evLdDXPA0bX vQ0OIKxFVbWseaolH+Iyne39MeL0Kfb4ojPmqX90cwOVKKnRGjqeQTQBlh+/KTCZxqaD WB1gAXSbxV/QkAErtbdxDM8rRBb78OnJtn0HxOgXGtrBnx5RsgQTvh3sylmiiJrvyd/o OmxDqTs7UJ0LlQVcmotMzwBy/gTBneGcyz4r23UKdPi9YRTPk22m8PdXf2FC2mTxl3JB BjkQ== 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 o15si2936939qko.273.2018.01.17.21.02.11; Wed, 17 Jan 2018 21:02:11 -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 1534962797; Thu, 18 Jan 2018 05:02:11 +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 3CA316279F; Thu, 18 Jan 2018 05:01:05 +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 5737F62776; Thu, 18 Jan 2018 05:00:54 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 9845061738 for ; Thu, 18 Jan 2018 05:00:38 +0000 (UTC) Received: from mxback3o.mail.yandex.net (mxback3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1d]) by forward106o.mail.yandex.net (Yandex) with ESMTP id AB97778262F for ; Thu, 18 Jan 2018 08:00:36 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback3o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id H2sVVYgOvh-0aUSgvPr; Thu, 18 Jan 2018 08:00:36 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OxxcXB4yuR-0UqC8ieQ; Thu, 18 Jan 2018 08:00:30 +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: Thu, 18 Jan 2018 08:00:08 +0300 Message-Id: <1516251609-24228-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516251609-24228-1-git-send-email-odpbot@yandex.ru> References: <1516251609-24228-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v1 3/4] build: 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 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 402 (lumag:travis-upd) ** https://github.com/Linaro/odp/pull/402 ** Patch: https://github.com/Linaro/odp/pull/402.patch ** Base sha: 1bb6291e4e9050d476fefb02f11024898847e2b7 ** Merge commit sha: ef2af52ea3f3fb674f4f2dcb187eeede6711cb72 **/ m4/odp_dpdk.m4 | 20 ++++++++++++++------ platform/linux-generic/Makefile.am | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 1887b0431..315a2fc4d 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -17,18 +17,28 @@ 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="$DPDK_LDFLAGS $DPDK_RPATH $DPDK_LIBS" + # link libodp-linux with -ldpdk + DPDK_LIBS_LIBODP="$DPDK_LDFLAGS $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 +109,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 +124,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 b7a8ff255..b76a15df1 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -305,7 +305,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)