From patchwork Mon Oct 6 14:48:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 38375 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C467D202E7 for ; Mon, 6 Oct 2014 14:50:56 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id p9sf2873939lbv.4 for ; Mon, 06 Oct 2014 07:50:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:from:to:date:in-reply-to :references:organization:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=ozRmshmQ6VIIysMsaQ1qW7HPgv59PQc7Wr065J4X8YQ=; b=ITriymQxmCnMjByOBxX2q9HTeLuc3bxxDtpPJoQHPLjf+/rgtZ5wxw1XdmXJwQDujB WcYgvI5FeECaZ24RyswxowSse5gnRETwOCpskkuBBbgI/ExwygWrdnZcTWXOGtKrSj+6 9d7xo1Z+OdFweA/GjCyMDnEwfU+tPkMUo/C67Nb9MIxUlq6aYQOMP8kc6tVurd9pkZ7P 1aydd/RLyICi5a4qZaomXyQinw8lWIT5VtRbV4lwIhZbzrWRFO6hyceacWBaNJ9iKpUV k7yC/SImrWYZrIGyEPTfATeOIQde49b9poFQRZ1b7iBQKK5rt7SDWjF32uXvnZz3Ct9Q dk9Q== X-Gm-Message-State: ALoCoQkjNKTvsvS4/QR0wO0KbZEWsp+Iy02bQilKzSQQDRxzdy1eI8WXh9yhFaxslus/yJ3Oef5Y X-Received: by 10.112.60.225 with SMTP id k1mr882397lbr.0.1412607055576; Mon, 06 Oct 2014 07:50:55 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.103 with SMTP id v7ls619677lal.32.gmail; Mon, 06 Oct 2014 07:50:55 -0700 (PDT) X-Received: by 10.112.166.66 with SMTP id ze2mr4728748lbb.68.1412607055390; Mon, 06 Oct 2014 07:50:55 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com [209.85.217.176]) by mx.google.com with ESMTPS id ll10si24189456lac.131.2014.10.06.07.50.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 Oct 2014 07:50:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id p9so4438218lbv.35 for ; Mon, 06 Oct 2014 07:50:55 -0700 (PDT) X-Received: by 10.152.22.137 with SMTP id d9mr25698238laf.29.1412607054975; Mon, 06 Oct 2014 07:50:54 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp196277lbb; Mon, 6 Oct 2014 07:50:53 -0700 (PDT) X-Received: by 10.224.37.69 with SMTP id w5mr29863814qad.67.1412607052975; Mon, 06 Oct 2014 07:50:52 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id e9si24539970qcr.13.2014.10.06.07.50.51 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 06 Oct 2014 07:50:52 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xb9az-0005Ka-48; Mon, 06 Oct 2014 14:49:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xb9ax-0005KN-6Q for xen-devel@lists.xen.org; Mon, 06 Oct 2014 14:49:03 +0000 Received: from [85.158.139.211:14612] by server-15.bemta-5.messagelabs.com id 6B/30-12002-EDBA2345; Mon, 06 Oct 2014 14:49:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1412606939!12257875!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29011 invoked from network); 6 Oct 2014 14:49:01 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 6 Oct 2014 14:49:01 -0000 X-IronPort-AV: E=Sophos;i="5.04,664,1406592000"; d="scan'208";a="179714067" Message-ID: <1412606936.14255.15.camel@citrix.com> From: Ian Campbell To: Yang Hongyang Date: Mon, 6 Oct 2014 15:48:56 +0100 In-Reply-To: <1411711999-3183-6-git-send-email-yanghy@cn.fujitsu.com> References: <1411711999-3183-1-git-send-email-yanghy@cn.fujitsu.com> <1411711999-3183-6-git-send-email-yanghy@cn.fujitsu.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.12.6-1 MIME-Version: 1.0 X-DLP: MIA2 Cc: laijs@cn.fujitsu.com, wency@cn.fujitsu.com, ian.jackson@eu.citrix.com, yunhong.jiang@intel.com, eddie.dong@intel.com, xen-devel@lists.xen.org, rshriram@cs.ubc.ca Subject: Re: [Xen-devel] [PATCH for-4.5 v21 05/14] autoconf: add libnl3 dependency for Remus network buffering support X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: On Fri, 2014-09-26 at 14:13 +0800, Yang Hongyang wrote: > NOTE: This patch changes tools/configure.ac, please rerun > autogen.sh while applying the patch. I'm going to commit the following as part of my next batch of committery. commit c2203e410b22985b925514b80d0e85a76c0d2ac5 Author: Ian Campbell Date: Mon Oct 6 15:47:17 2014 +0100 autoconf: autogen.sh after 622e837570f4 "autoconf: add libnl3 dependency ..." It appears this was forgotten. Signed-off-by: Ian Campbell diff --git a/tools/configure b/tools/configure index 78bcb6b..fe44b4e 100755 --- a/tools/configure +++ b/tools/configure @@ -629,6 +629,9 @@ SYSTEMD_CFLAGS SYSTEMD_MODULES_LOAD SYSTEMD_DIR systemd +remus_netbuf +LIBNL3_LIBS +LIBNL3_CFLAGS libiconv PTYFUNCS_LIBS PTHREAD_LIBS @@ -829,6 +832,8 @@ PKG_CONFIG_PATH PKG_CONFIG_LIBDIR glib_CFLAGS glib_LIBS +LIBNL3_CFLAGS +LIBNL3_LIBS SYSTEMD_CFLAGS SYSTEMD_LIBS' @@ -1528,6 +1533,9 @@ Some influential environment variables: path overriding pkg-config's built-in search path glib_CFLAGS C compiler flags for glib, overriding pkg-config glib_LIBS linker flags for glib, overriding pkg-config + LIBNL3_CFLAGS + C compiler flags for LIBNL3, overriding pkg-config + LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config SYSTEMD_CFLAGS C compiler flags for SYSTEMD, overriding pkg-config SYSTEMD_LIBS @@ -8403,6 +8411,100 @@ fi done +# Check for libnl3 >=3.2.8. If present enable remus network buffering. + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL3" >&5 +$as_echo_n "checking for LIBNL3... " >&6; } + +if test -n "$LIBNL3_CFLAGS"; then + pkg_cv_LIBNL3_CFLAGS="$LIBNL3_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 >= 3.2.8 libnl-route-3.0 >= 3.2.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnl-3.0 >= 3.2.8 libnl-route-3.0 >= 3.2.8") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBNL3_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0 >= 3.2.8 libnl-route-3.0 >= 3.2.8" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBNL3_LIBS"; then + pkg_cv_LIBNL3_LIBS="$LIBNL3_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 >= 3.2.8 libnl-route-3.0 >= 3.2.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnl-3.0 >= 3.2.8 libnl-route-3.0 >= 3.2.8") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBNL3_LIBS=`$PKG_CONFIG --libs "libnl-3.0 >= 3.2.8 libnl-route-3.0 >= 3.2.8" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBNL3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnl-3.0 >= 3.2.8 libnl-route-3.0 >= 3.2.8" 2>&1` + else + LIBNL3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnl-3.0 >= 3.2.8 libnl-route-3.0 >= 3.2.8" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBNL3_PKG_ERRORS" >&5 + + libnl3_lib="n" +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + libnl3_lib="n" +else + LIBNL3_CFLAGS=$pkg_cv_LIBNL3_CFLAGS + LIBNL3_LIBS=$pkg_cv_LIBNL3_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + libnl3_lib="y" +fi + +if test "x$libnl3_lib" = "xn" ; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling support for Remus network buffering. + Please install libnl3 libraries, command line tools and devel + headers - version 3.2.8 or higher" >&5 +$as_echo "$as_me: WARNING: Disabling support for Remus network buffering. + Please install libnl3 libraries, command line tools and devel + headers - version 3.2.8 or higher" >&2;} + remus_netbuf=n + + +else + + remus_netbuf=y + + +fi + + + + fi # ! $rump