From patchwork Wed Feb 5 13:51:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 317150 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id EE7FC2C0097 for ; Thu, 6 Feb 2014 00:52:05 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4777532E8F; Wed, 5 Feb 2014 13:52:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ioBDuoXRrl0t; Wed, 5 Feb 2014 13:52:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2798632F90; Wed, 5 Feb 2014 13:51:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 953AC1C24B0 for ; Wed, 5 Feb 2014 13:51:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 914078B7B2 for ; Wed, 5 Feb 2014 13:51:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pf8ISeAM0XIZ for ; Wed, 5 Feb 2014 13:51:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com [74.125.83.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id D0F208B7AF for ; Wed, 5 Feb 2014 13:51:19 +0000 (UTC) Received: by mail-ee0-f53.google.com with SMTP id t10so239258eei.26 for ; Wed, 05 Feb 2014 05:51:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:content-transfer-encoding:subject :message-id:in-reply-to:references:user-agent:date:from:to; bh=8hnDEgWqUtZnmZM/aqDYykuD89cz4mvJwJ+P1bSSTrY=; b=lx3Et7D7IqW0Ne9bauxy34mi5VcPdRnQ54i3aXnLyclFZnydKPOdslT4RaTk9sPI5I E/Z60YBUzlgr6C4srzH45rqKVds81yPs8s2gzP8fstUg3DlBDAPekz1MwwG5wIzHCtTN gYZYnOag7rSbF/IUjC7FfWaOtBx0m/v2p/+YU076UVkNK/XFxJKISleeHD22SjJg3joX poTcxw49J1JYn7krUsjc+NcT4v7fX5szt6ZAlxGx+zBnmx61aSB+lq5S7HLU/a2UAubU rc5+bOnnqyBctEbJn/e6ZijQsRD8rYjUAwiqWytUfIXSTRgLJx3l25g7eW/zI+rrCsKW me2g== X-Received: by 10.14.202.8 with SMTP id c8mr2180520eeo.88.1391608278454; Wed, 05 Feb 2014 05:51:18 -0800 (PST) Received: from [127.0.1.1] (d54C62EEB.access.telenet.be. [84.198.46.235]) by mx.google.com with ESMTPSA id s46sm37356217eeb.0.2014.02.05.05.51.17 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Feb 2014 05:51:17 -0800 (PST) MIME-Version: 1.0 X-Mercurial-Node: 2c0482e0d65779af52cfe2ac932cbf220adca591 Message-Id: <2c0482e0d65779af52cf.1391608260@argentina> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Wed, 05 Feb 2014 14:51:00 +0100 From: Thomas De Schampheleire To: buildroot@busybox.net Subject: [Buildroot] [PATCH 8 of 8 v2] infra: remove separate definition of DISABLE_DOCUMENTATION X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Since we now always disable documentation on target, there is no need to have a separate variable DISABLE_DOCUMENTATION anymore. Suggested-by: Thomas Petazzoni Signed-off-by: Thomas De Schampheleire --- v2: new patch Note: I'm not 100% convinced by this patch, but I post it to ignite the discussion. The advantage of the separate variable is the grouping of the options. Without it, it is not so clear that --with-fop is related to documentation, unless you already know what fop is. Also, there is no clear place to put the comment regarding passing multiple options, so I just removed it (losing some information). Both problems could be solved by keeping the variable but moving it to autotools.mk, but this is then no longer consistent with the other DISABLE_xxx variables. diff --git a/package/Makefile.in b/package/Makefile.in --- a/package/Makefile.in +++ b/package/Makefile.in @@ -332,16 +332,6 @@ ifneq ($(BR2_LARGEFILE),y) DISABLE_LARGEFILE= --disable-largefile endif -# The configure option varies, but since unknown options are ignored -# we can pass all of them. -DISABLE_DOCUMENTATION = \ - --disable-gtk-doc \ - --disable-doc \ - --disable-docs \ - --disable-documentation \ - --with-xmlto=no \ - --with-fop=no - ifeq ($(BR2_INET_IPV6),y) DISABLE_IPV6= --enable-ipv6 else diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -110,7 +110,12 @@ define $(2)_CONFIGURE_CMDS --exec-prefix=/usr \ --sysconfdir=/etc \ --program-prefix="" \ - $$(DISABLE_DOCUMENTATION) \ + --disable-gtk-doc \ + --disable-doc \ + --disable-docs \ + --disable-documentation \ + --with-xmlto=no \ + --with-fop=no $$(DISABLE_NLS) \ $$(DISABLE_LARGEFILE) \ $$(DISABLE_IPV6) \