From patchwork Wed Jan 24 03: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: 125621 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp141355ljf; Tue, 23 Jan 2018 19:06:23 -0800 (PST) X-Google-Smtp-Source: AH8x225prmHSXThqgMI8ZAiohZmSfE1l5BF1A8vewR/v9YcB+K8ONBRtPaHoZeiO2Sr/ZNmZev5S X-Received: by 10.237.51.230 with SMTP id v93mr7096145qtd.120.1516763183436; Tue, 23 Jan 2018 19:06:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516763183; cv=none; d=google.com; s=arc-20160816; b=vXrTu+qQ+ht3gn2cpojpvTXdtNdXmJaNtGiUqheM/OypgznWTjMoRbnj7ILvhX099u dUIU3Ab7LKcZg1UL9pB0Exb2AAOSv1qugNbVZlikFCUpnMr3F5OEs2GENKBaFCubywoL 9HrHyw2+A8j0Yk0gvsY47QG0+PRzltD6XezRYya/LDaFePzl5WwP7ljzoynUDjRoeky4 4Jn9h+WY/gM7C0MGgWt2fwx0UEPed3i6fqYpvsaOHP5FdqHUPzQBWwIIYknzd/PoEXW6 +RclhNtIX23juj+U1xYf94P5IoQsa6v4YZvor1ZoLKy8LUKjak5c8RZEVrvzq8R+rlOl hKJg== 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=+kUE3G9JpCamVMfRaK+iAZDRIOJ/QCXLcOoaCuhfP3U=; b=FV9r38nbP7Wq+HYdL+cR+BOwPE/b37AoaRvY0mVXqo/TE30ryKXx33i5RVlp2KDp5D 4pMddzWi9vtypX28OXua/ipRAllg+cqq1O9OBlhvr7o6Wx0pHlV3C7/4oocawF9DgtJ6 NWJJENsBOVJrN1aIX5Y5WMFyoxax5Wa6w2iMO6QjL8Alrmgg2JQwY9Yov6WY/C2ujHhx ZV7nCEjsQoN6+WkNF1ONE4IkeiASZo1s5SYJ6xAtBYXiOtkvDwlJPDXr9uZ8Na5VAPsY h0Zp1x00EPT+L4nVgpS0PPPgJ4dYUpduLs2CYX0rF9PnHfQxnhTcUSSuMGtzJGG0WS1f 8Cbw== 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 l73si2517521qkl.253.2018.01.23.19.06.23; Tue, 23 Jan 2018 19:06:23 -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 1CEDB617E0; Wed, 24 Jan 2018 03:06:23 +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 348AB61750; Wed, 24 Jan 2018 03:02:59 +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 09F0C617F5; Wed, 24 Jan 2018 03:02:50 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id 3DDEE6171B for ; Wed, 24 Jan 2018 03:00:21 +0000 (UTC) Received: from mxback3o.mail.yandex.net (mxback3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1d]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 7DDF134C1748 for ; Wed, 24 Jan 2018 06:00:15 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback3o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id JR77e3mpkR-0F5atKVs; Wed, 24 Jan 2018 06:00:15 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id mUFfJKeeR5-0E3KumNE; Wed, 24 Jan 2018 06:00:14 +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 06:00:10 +0300 Message-Id: <1516762814-30313-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516762814-30313-1-git-send-email-odpbot@yandex.ru> References: <1516762814-30313-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 416 Subject: [lng-odp] [PATCH v4 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: b3627670bafa53ad9e0b7833b8864144ce6d7621 **/ 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)