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) From patchwork Wed Jan 24 03: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: 125617 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp140132ljf; Tue, 23 Jan 2018 19:03:27 -0800 (PST) X-Google-Smtp-Source: AH8x2276zoZdcWOAojhzPAij6kU/vjhkBBf++wxFS+dXuyaGeve1FVEdGQXaUloJ8HswcJIqqbnI X-Received: by 10.237.48.106 with SMTP id 97mr7132291qte.48.1516763007491; Tue, 23 Jan 2018 19:03:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516763007; cv=none; d=google.com; s=arc-20160816; b=heR/mGh5QIr4xF6iIi3VQ0SWspXdxvTDTuLwoqG3eDvJwTUmo3DvUjuKXoqFwslVBi gUCV3Mf5+zKcZWkYWBJNejSIZLP5/fKJ7zlAfz2g5/r2xfxM/9B4z0ID657z52vRt3CJ 8/fPydwSLxYsNcs4NcXAHKv1XlKFPFxCC2IEmhaHhCNg10r96n3xaMbK1GXmAbEpQ2Og EEGZAWANwld9jN1DlPBrc02PmsSKAAZyFDn8Kk38rfTwSIwK6T4cnuHcN9iDC65ouvZX Wp69kywdTCDuq42cRMFUcyZNwcxcfDpVsi8zyaWF0ZO2j0ZEZFoFyBW4xlNenwYlX2tc sTpg== 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=GMLKkeC/OOTD2ckcqkava47xsSnEBSirEHUMgeC3K2s=; b=HEER4K9pcWqmW+l1x+syHVfP3DAkxY8Xz0ehJM8jOn+Y1QgTcbpuUNQLVQUSq4VoTW iIGbNPRicFYf1PRjZv1I8YBxpWYD4bT/WwiJplM3TZtkizdi10UwKawVKqYoQ0b+M7YK pWKEaM+d9jn6Pr7L6HxoKJmolo3j6Anqj6cT6CldArtraY0zdUiHUekCHgGoE/G4/iYM RL+3lM2LeqUqcR1BX9W51T9qoeYkpBt71HZyibsW2stMTj2+ZhtncYtL/dHGslTRY6yw 0mGwfpAreUkgSPlkvtRNgmaEis36JnncbwnW/FemmcwpVLXeGM+Y4ZVS5pSj1wzk6McH KtUw== 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 d47si1546761qtc.123.2018.01.23.19.03.27; Tue, 23 Jan 2018 19:03:27 -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 3025D617C8; Wed, 24 Jan 2018 03:03:27 +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 1F61D616DF; Wed, 24 Jan 2018 03:01:18 +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 26A6F61527; Wed, 24 Jan 2018 03:01:11 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id 069E161527 for ; Wed, 24 Jan 2018 03:00:17 +0000 (UTC) Received: from mxback14g.mail.yandex.net (mxback14g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:93]) by forward106p.mail.yandex.net (Yandex) with ESMTP id 0F4012D833A3 for ; Wed, 24 Jan 2018 06:00:16 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback14g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id YaCAcuVhW1-0F0iX74X; Wed, 24 Jan 2018 06:00:16 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id mUFfJKeeR5-0F3OY411; Wed, 24 Jan 2018 06: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 06:00:11 +0300 Message-Id: <1516762814-30313-3-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 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: b3627670bafa53ad9e0b7833b8864144ce6d7621 **/ 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 03: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: 125618 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp140362ljf; Tue, 23 Jan 2018 19:04:01 -0800 (PST) X-Google-Smtp-Source: AH8x226kl6+pYXf1jkxttWviisDAjXzukGHxlSquekAs2bXyNPF6jeCQLemrZCY+Z81UJ8DdmF2p X-Received: by 10.55.26.212 with SMTP id l81mr7086689qkh.237.1516763041367; Tue, 23 Jan 2018 19:04:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516763041; cv=none; d=google.com; s=arc-20160816; b=K1+OnKxh5Ohd2HrtsTfdD2nBQ3Y4y8MJg/09AVKsQKQBUmcTSD80B8cCjXuXT++0ov 8ssoX0D7MQ8o2vQ3Wri6rf/T01vBhq+LgVGkenMk6+loBFNZnxU2/RUYuMJoFvbIkpW1 tuVfCCiTYNB+zZ75MPn+iB1u5UoLmlhINmIA6x5pa0jSUq4tC2NiMZaozeGMfuy3rSAF Nvn/vDNhGADlnohJy11ApB59UdnSeVYY2MRB2LqJlSt+X6eStMuXHRfPnj/BZZDVxuDP /JaWsbLsaL36tBNYxyz6WStlmkqidTOWDZGkwMoQ9zh3wcEDgE/mQv0IftI3+nstj3bh Jq1A== 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=HzW60uTzfAPcKNILwe3h8KVsgZQUq8ljSYH1CHTGQK8=; b=n2aFuHdHQoPiMj6cs4oKLfnLxZWDpYP7QwnRzbtrSugv84rG0YMq7t0v+az9P5EkIq LRbKOtVFeBTAAUX6A9gsWq9w0FtZ2Rponkcya1WefvqowcYQ4HuUPtTFZ6LQ4Vfu1YPz 6AFKVhu3NPEj6qdthuxQk+pkJhAI00xU/1ce55c9tBIPmiEg2UIGwzhRR+y66jfNPoXo 8damO9E9nL/inIVjghwJTef3Sd/ZYlf8CDoQC6R7ooeadok9PYgMC0Bo/HeFeB40suZ4 1fYQkXKG0gQx1ks+sZiZyIZblmWzQbODi2toVaBPiyhJypNMFmcsMjm9k83uvnLrM6Re rAUQ== 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 z137si1934779qka.276.2018.01.23.19.04.01; Tue, 23 Jan 2018 19:04: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 11BF4617B7; Wed, 24 Jan 2018 03:04: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_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 AA61D617E0; Wed, 24 Jan 2018 03:01:35 +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 238D4617D7; Wed, 24 Jan 2018 03:01:29 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id E5B6560683 for ; Wed, 24 Jan 2018 03:00:17 +0000 (UTC) Received: from mxback10o.mail.yandex.net (mxback10o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::24]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 9EBCB5D84335 for ; Wed, 24 Jan 2018 06:00:16 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback10o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id XvaV0WJSI3-0G9ioMRg; Wed, 24 Jan 2018 06:00:16 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id mUFfJKeeR5-0G3086fQ; Wed, 24 Jan 2018 06: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 06:00:12 +0300 Message-Id: <1516762814-30313-4-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 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: b3627670bafa53ad9e0b7833b8864144ce6d7621 **/ 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 03:00:13 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: 125620 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp141115ljf; Tue, 23 Jan 2018 19:05:47 -0800 (PST) X-Google-Smtp-Source: AH8x227hidKeWphzWryJRC9pkOOu8SLfWHGXrSmsEcmoGPwQ82s0HCHfrUjWgG9JyNY3h2tmnCuC X-Received: by 10.200.13.1 with SMTP id q1mr115330qti.64.1516763147500; Tue, 23 Jan 2018 19:05:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516763147; cv=none; d=google.com; s=arc-20160816; b=sySmiWzNZDzxKBWbp5sBW8knrrolhrJSvAc8TkRy6wqCsGjz5e9pWECfNbmvc0ZDyx vLVhtzRop944GDVe8X9Tf1TlpSqHv4KMnBBg8gckzg1NdZ8ewS84hMTlKdYqI6aOkWpK ltC+MNsICEuj8yTMF8KWd6SCdjgrA25q8Jklmn+q2xHLexG2WME9eR1CCItfWN2k0jy1 dYVa7CV93cQteezc36jQjkjAsHbVGBovqPV8J0HI+4XsvtpwaJHU2NmNpOAC0rfM5Xvk 6HTQuaBGon7TRKYY77YQPSqPFVKUN7ZQhncaVC+O2oXq/E2qoda/s74q5+i67JI04yQl 2DgA== 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=3aOk8tcqaFBQ1jz/m3Qs6+V6C/dqynfmO7lXzxF3h5Q=; b=JiQvpweeN418H+GK1oaL3ttpQeEemb89bjhw18DjzSoTsRJHS4bhVtnXubgC6S8rP1 fCydhQUvi8GLp/venaUdq7CCY8nK2Cdu1ZIRB/owI+XMkCAGuMXhG2h4/RbaN5uBO20h 8xw+OkaPAABl1lSVFkHbSddM7KrQ1+/2bCkuxt+5au8lNUkgcUgXFaeU8z7UzMoIS/DI nZVwGHnaMiypSMUHfb2MYgtAtqudZigzMkdLCoCs+zs6MawJq1B8CugFj2sZX5Lw8NOx ak3lo9Eg5Xnb/uGOxu1n/B71CtqJdZDd/j5XY30gh2lr6RaQ/nfGs/jaFAvQSyoeXl7f XncQ== 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 h126si3376456qkf.206.2018.01.23.19.05.47; Tue, 23 Jan 2018 19:05:47 -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 2E59061785; Wed, 24 Jan 2018 03:05:47 +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 883ED617EC; Wed, 24 Jan 2018 03:02:06 +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 76B5961702; Wed, 24 Jan 2018 03:02:01 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id 2BAB761701 for ; Wed, 24 Jan 2018 03:00:19 +0000 (UTC) Received: from mxback20j.mail.yandex.net (mxback20j.mail.yandex.net [IPv6:2a02:6b8:0:1619::114]) by forward105p.mail.yandex.net (Yandex) with ESMTP id 3BC3D4081986 for ; Wed, 24 Jan 2018 06:00:17 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback20j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id XNZKwI9luR-0HFebR70; Wed, 24 Jan 2018 06:00:17 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id mUFfJKeeR5-0G3uYKoj; Wed, 24 Jan 2018 06: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 06:00:13 +0300 Message-Id: <1516762814-30313-5-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 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: b3627670bafa53ad9e0b7833b8864144ce6d7621 **/ .travis.yml | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index fca06a0d2..ce1fd27e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,28 +14,6 @@ group: deprecated-2017Q2 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 +31,6 @@ addons: # build_command: "make" # branch_pattern: coverity_scan -compiler: - - gcc - - clang-3.8 - cache: ccache: true pip: true @@ -67,6 +41,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 +65,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 03:00:14 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: 125619 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp140678ljf; Tue, 23 Jan 2018 19:04:50 -0800 (PST) X-Google-Smtp-Source: AH8x22714AJklTs+Nokb1ZcbShRoRLGwGDVrys3cHkIxiL6cI2JzQjhQgV4Vfm1d9XIl739Algbi X-Received: by 10.55.72.204 with SMTP id v195mr6611776qka.295.1516763090033; Tue, 23 Jan 2018 19:04:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516763090; cv=none; d=google.com; s=arc-20160816; b=qEfRz9Gnq7Z3LbMRc1KjAd4g3oE/6XD4T0kZu0eQj52lnRWxo15g1KBxx6zyXs/OP0 k+jcBpeh5Wpjhozhf1dI/bTbitbV6Y50/E0v+6AgV7AfKQ8BEvQC1xLXjsXwCX51/xpR fjauesmMxhwdhQoukD/u1HuCRoyRC3z8++C+wkhP4KJMLgRhLWCYyIr5CrWRaArIlGSs /hSYe1k5wyQJU0v/03iNfl2g22o9e9dtJTRaEBNN64SJAmcblg1UCH04wsF2okHlfL8W RztEn8VRFM0TjxGzH050n5OxWmKzGi7n/Rnalcwn6fC41PnVPXtxQBiU6N7xNBkfMJ6G zH2Q== 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=lQms0vXMGP9ivrdjEspFE7FrZMLVdMnUY9IjJSqxU+E=; b=0LXjXYFJVpgEk2/x6TZaFkLBXDgtvQc+lnKryilJc2s/bgwL3DCIzSdoFOBPQwJiTW GrwWfe+T3wfgGboDTs6g/ksHfp+XbiYFG9OZmDOIMoiPDs7ey8Y14IFgat32+dHd75gN 0QFt32PLpi4u3j1QndX6CRgd2BQPBFSNY9r1IBnawe0gsIMtQgUxBkDvbj1eo3F5TXH0 AD/3plCeNlOpB944CQvxhDT6MOyb4pW3yUaxPtDdNDIHAw66H7BBgwE9Jpyhr/4wmNNv mbWEUBObq2/01EQNAPuzqdMj4VBimbDu6Yh0r2cRjNRrzmT+nDK1Om5gPTFuWNoXPsPN BblA== 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 o15si687401qko.273.2018.01.23.19.04.49; Tue, 23 Jan 2018 19:04:50 -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 AB6BD619C6; Wed, 24 Jan 2018 03:04:49 +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 4024F616F9; Wed, 24 Jan 2018 03:02:02 +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 C1B86617EF; Wed, 24 Jan 2018 03:01:54 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id 2E38761702 for ; Wed, 24 Jan 2018 03:00:19 +0000 (UTC) Received: from mxback15g.mail.yandex.net (mxback15g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:94]) by forward105p.mail.yandex.net (Yandex) with ESMTP id D6E6F4081C56 for ; Wed, 24 Jan 2018 06:00:17 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback15g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 73u7MtSBLM-0HS4h5vp; Wed, 24 Jan 2018 06:00:17 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id mUFfJKeeR5-0H3CVp67; Wed, 24 Jan 2018 06: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 06:00:14 +0300 Message-Id: <1516762814-30313-6-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 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: b3627670bafa53ad9e0b7833b8864144ce6d7621 **/ .travis.yml | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce1fd27e1..7dd7522da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,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" @@ -56,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" @@ -159,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 @@ -168,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 @@ -243,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