From patchwork Wed Apr 9 09:23:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 28073 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 988772145A for ; Wed, 9 Apr 2014 09:25:47 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id rl12sf9738106iec.2 for ; Wed, 09 Apr 2014 02:25:46 -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=JWsR65nDg9UmAx+DPqJJc6+pzjGK761msupHCO7dJ1A=; b=HdCfZ49+dR7rLkwk9GiKseQgOdRtwQKu1h0d7MnHvK/v1XfHrVI2CNgeGoVRMw3aYG l7rOFFP314Nt15pQoaDtuPMlpDJgC2zCxGQrzS/vgBOsypXRK5RNgnIopzAkvcKu5alG pOXcsca+L5VbTF5hVFmq0cTH1yjWn4ReAaffp9n6tdwyqkdQvyxqFofjAlMLogiU/iQx THFWJcewHxuTQgPuhvrUHf5Mfdvhz0/Ba/pTjKo0sepxmJ5tW9ubMJdUAIaU+Exl57Ip r5T2bJS+i1YSrUZVCr+bNSDksSTwnVIK4imSWKDzWdDMPJdeS5do41jwtguRLYCAgrkY hGGQ== X-Gm-Message-State: ALoCoQnE7ULPDRVVBNoyeHQ6jVHs5/7sj2MLeHXEHKWWesJ10zd1/9LOpeGz+wT6Iq9BfT5nKhlH X-Received: by 10.42.240.19 with SMTP id ky19mr3909987icb.4.1397035546908; Wed, 09 Apr 2014 02:25:46 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.229 with SMTP id t92ls391151qgd.9.gmail; Wed, 09 Apr 2014 02:25:46 -0700 (PDT) X-Received: by 10.52.33.136 with SMTP id r8mr6553620vdi.2.1397035546690; Wed, 09 Apr 2014 02:25:46 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id qr10si49348vcb.189.2014.04.09.02.25.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Apr 2014 02:25:46 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id il7so1779982vcb.4 for ; Wed, 09 Apr 2014 02:25:46 -0700 (PDT) X-Received: by 10.220.159.4 with SMTP id h4mr7960953vcx.1.1397035546483; Wed, 09 Apr 2014 02:25:46 -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.220.12.8 with SMTP id v8csp314056vcv; Wed, 9 Apr 2014 02:25:46 -0700 (PDT) X-Received: by 10.50.141.198 with SMTP id rq6mr9136546igb.38.1397035545886; Wed, 09 Apr 2014 02:25:45 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id vi8si3002197igb.34.2014.04.09.02.25.45 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 09 Apr 2014 02:25:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) 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 1WXojb-0008Rk-Bp; Wed, 09 Apr 2014 09:23:55 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WXojZ-0008Re-UB for xen-devel@lists.xen.org; Wed, 09 Apr 2014 09:23:54 +0000 Received: from [193.109.254.147:10789] by server-14.bemta-14.messagelabs.com id DE/28-08195-9A115435; Wed, 09 Apr 2014 09:23:53 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1397035431!7221013!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6542 invoked from network); 9 Apr 2014 09:23:52 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 9 Apr 2014 09:23:52 -0000 X-IronPort-AV: E=Sophos;i="4.97,825,1389744000"; d="scan'208";a="119424671" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 09 Apr 2014 09:23:51 +0000 Received: from [10.80.2.80] (10.80.2.80) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Wed, 9 Apr 2014 05:23:50 -0400 Message-ID: <1397035429.31448.37.camel@kazak.uk.xensource.com> From: Ian Campbell To: Olaf Hering Date: Wed, 9 Apr 2014 10:23:49 +0100 In-Reply-To: <20140409091402.GA29653@aepfle.de> References: <1396617616.4211.234.camel@kazak.uk.xensource.com> <20140409064947.GA25741@aepfle.de> <1397032095.31448.11.camel@kazak.uk.xensource.com> <20140409090310.GA28187@aepfle.de> <1397034464.31448.27.camel@kazak.uk.xensource.com> <20140409091402.GA29653@aepfle.de> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.8.5-2+b3 MIME-Version: 1.0 X-Originating-IP: [10.80.2.80] X-DLP: MIA1 Cc: Ian Jackson , xen-devel Subject: Re: [Xen-devel] [GIT PULL v2] remove xend and libxen for 4.5 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=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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 Wed, 2014-04-09 at 11:14 +0200, Olaf Hering wrote: > On Wed, Apr 09, Ian Campbell wrote: > > > On Wed, 2014-04-09 at 11:03 +0200, Olaf Hering wrote: > > > On Wed, Apr 09, Ian Campbell wrote: > > > > > > > Looks like some stray CONFIG_XENDs remained after rebasing for v2. > > > > > > > > However you should also have rerun configure so CONFIG_XEND should not > > > > be set anyway. The following takes care of the first issue. > > > > > > Thanks, with this patch the rpmbuild makes progress past the 'make' call. > > > > Thanks, I'll take this as a Tested-by: Olaf Hering if > > you don't mind. > > Yes, please. > > > How was CONFIG_XEND getting set in your build though? > > I had configure --enable-xend in my rpm spec file. But nothing should understand enable-xend any more! Ah, I also missed the change to docs/configure.ac. Sigh.... -----8<--------- >From c781e81173de31077ac79d67aab7ce4879636bc3 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 9 Apr 2014 09:26:23 +0100 Subject: [PATCH v2] docs: remove stray CONFIG_XENDs and configure option from docs. These were added by 7dbfc2f8b054 "docs: Honour --{en, dis}able-xend when building docs" between v1 and the (eventually committed) v2 of 9e8672f1c36d "tools: remove xend and associated python modules" and were missed when rebasing for v2. Signed-off-by: Ian Campbell Tested-by: Olaf Hering Acked-by: Ian Jackson --- v2: Also remove option from docs/configure. --- config/Docs.mk.in | 3 --- docs/Makefile | 2 -- docs/configure | 34 ---------------------------------- docs/configure.ac | 3 --- 4 files changed, 42 deletions(-) diff --git a/config/Docs.mk.in b/config/Docs.mk.in index 03fac60..a2a72fd 100644 --- a/config/Docs.mk.in +++ b/config/Docs.mk.in @@ -12,6 +12,3 @@ POD2HTML := @POD2HTML@ POD2TEXT := @POD2TEXT@ MARKDOWN := @MARKDOWN@ PERL := @PERL@ - -# Subsets of documentation to build -CONFIG_XEND := @xend@ diff --git a/docs/Makefile b/docs/Makefile index 7cd7440..5153bcb 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -9,10 +9,8 @@ DOC_ARCHES := arm x86_32 x86_64 # Documentation sources to build MAN1SRC-y := $(wildcard man/xl*.pod.1) MAN1SRC-y += $(wildcard man/xenstore*.pod.1) -MAN1SRC-$(CONFIG_XEND) += man/xm.pod.1 MAN5SRC-y := $(wildcard man/xl*.pod.5) -MAN5SRC-$(CONFIG_XEND) += man/xend-config.sxp.pod.5 man/xmdomain.cfg.pod.5 MARKDOWNSRC-y := $(wildcard misc/*.markdown) diff --git a/docs/configure b/docs/configure index c54f431..d76e4d4 100755 --- a/docs/configure +++ b/docs/configure @@ -588,7 +588,6 @@ ac_unique_file="misc/xen-command-line.markdown" ac_subst_vars='LTLIBOBJS LIBOBJS PERL -xend MARKDOWN POD2TEXT POD2HTML @@ -635,7 +634,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_xend ' ac_precious_vars='build_alias host_alias @@ -1251,13 +1249,6 @@ if test -n "$ac_init_help"; then esac cat <<\_ACEOF -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-xend Enable xend toolstack documentation (default is - DISABLED) - Some influential environment variables: FIG2DEV Path to fig2dev tool POD2MAN Path to pod2man tool @@ -1996,31 +1987,6 @@ $as_echo "$as_me: WARNING: markdown is not available so some documentation won't fi -# Enable/disable options - -# Check whether --enable-xend was given. -if test "${enable_xend+set}" = set; then : - enableval=$enable_xend; -fi - - -if test "x$enable_xend" = "xno"; then : - - ax_cv_xend="n" - -elif test "x$enable_xend" = "xyes"; then : - - ax_cv_xend="y" - -elif test -z $ax_cv_xend; then : - - ax_cv_xend="n" - -fi -xend=$ax_cv_xend - - - # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 diff --git a/docs/configure.ac b/docs/configure.ac index 7e6d1b1..e545b00 100644 --- a/docs/configure.ac +++ b/docs/configure.ac @@ -19,9 +19,6 @@ AX_DOCS_TOOL_PROG([POD2HTML], [pod2html]) AX_DOCS_TOOL_PROG([POD2TEXT], [pod2text]) AX_DOCS_TOOL_PROGS([MARKDOWN], [markdown], [markdown markdown_py]) -# Enable/disable options -AX_ARG_DEFAULT_DISABLE([xend], [Enable xend toolstack documentation]) - AC_ARG_VAR([PERL], [Path to Perl parser]) AX_PATH_PROG_OR_FAIL([PERL], [perl])