From patchwork Sat Sep 27 19:32:43 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: 394110 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 181DC140129 for ; Sun, 28 Sep 2014 05:37:56 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E3B4C91C4E; Sat, 27 Sep 2014 19:37:55 +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 vXN1ze8+rV0e; Sat, 27 Sep 2014 19:37:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 59F10923D6; Sat, 27 Sep 2014 19:36:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 1B1631C1F95 for ; Sat, 27 Sep 2014 19:36:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 17DCE95C02 for ; Sat, 27 Sep 2014 19:36:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WzZ1W1zF-4rQ for ; Sat, 27 Sep 2014 19:36:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6F02495D5F for ; Sat, 27 Sep 2014 19:36:27 +0000 (UTC) Received: by mail-lb0-f182.google.com with SMTP id z11so4395817lbi.27 for ; Sat, 27 Sep 2014 12:36:25 -0700 (PDT) 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:cc; bh=S/akhn5NJ6Qt/AVjISRpgf76reHfLNTQAYxE2ms3xIE=; b=CpEWxKcr+7g4a3a2s2xzpgZBqqSsR45QitzDpxjvxm/F4YfFos6jsusRMD20Y4JBzx fmc/UI8ih8oaYx5rf0OL7ORRB7h/2/R02NORWOmFaf6hxTgMXkrVSGlYLo4DQV2MPJ9Y Cb6bHp16b9ekFI0++mv5apcXLa0L479PIIJz8JnDA6NWlk0ctCpwqCEuqtCmchH90wIu xRdkrwcUAbYnTq6RDdlEATe37R0ObwQ/q9Cw/q7UNpOGKLxK2eDgjV4vGGwk51hJTHDQ 8m8yy7jnq3I3zRBpbEJdjlRTHkfOmS/OIDNVs3anWWc4gr+ZEowUxW4hzzwqdUTTmxoN +VYQ== X-Received: by 10.112.35.201 with SMTP id k9mr22895425lbj.88.1411846585605; Sat, 27 Sep 2014 12:36:25 -0700 (PDT) Received: from [127.0.0.1] (d54C62EEB.access.telenet.be. [84.198.46.235]) by mx.google.com with ESMTPSA id f6sm938873lbh.10.2014.09.27.12.36.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 27 Sep 2014 12:36:24 -0700 (PDT) MIME-Version: 1.0 X-Mercurial-Node: ab0eaa8cbce7bfec363a8c69f6ae3fca7f91823c Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/3.0 Date: Sat, 27 Sep 2014 21:32:43 +0200 From: Thomas De Schampheleire To: buildroot@buildroot.org Cc: thomas.petazzoni@free-electrons.com, yann.morin.1998@free.fr Subject: [Buildroot] [PATCH 06 of 15] packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_AUTORECONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_AUTORECONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire Reviewed-by: "Yann E. MORIN" --- v2: rebase docs/manual/adding-packages-autotools.txt | 2 +- package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk | 2 +- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- package/pkg-autotools.mk | 4 ++-- package/webkit/webkit.mk | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt --- a/docs/manual/adding-packages-autotools.txt +++ b/docs/manual/adding-packages-autotools.txt @@ -126,7 +126,7 @@ +LIBFOO_AUTORECONF=YES+. These are passed in the environment of the 'autoreconf' command. By default, empty. -* +LIBFOO_AUTORECONF_OPT+ to specify additional options +* +LIBFOO_AUTORECONF_OPTS+ to specify additional options passed to the 'autoreconf' program if +LIBFOO_AUTORECONF=YES+. By default, empty. diff --git a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk --- a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk +++ b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk @@ -12,7 +12,7 @@ # There is no generated configure script in the tarball. GST_PLUGIN_X170_AUTORECONF = YES -GST_PLUGIN_X170_AUTORECONF_OPT = -Im4/ +GST_PLUGIN_X170_AUTORECONF_OPTS = -Im4/ GST_PLUGIN_X170_DEPENDENCIES = gstreamer libglib2 on2-8170-libs $(eval $(autotools-package)) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -13,7 +13,7 @@ GST1_PLUGINS_BAD_LICENSE = LGPLv2+ LGPLv2.1+ GST1_PLUGINS_BAD_AUTORECONF = YES -GST1_PLUGINS_BAD_AUTORECONF_OPT = -I $(@D)/common/m4 +GST1_PLUGINS_BAD_AUTORECONF_OPTS = -I $(@D)/common/m4 GST1_PLUGINS_BAD_GETTEXTIZE = YES GST1_PLUGINS_BAD_CONF_OPT = \ diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -100,7 +100,7 @@ endif ifeq ($(4),host) - $(2)_AUTORECONF_OPT ?= $$($(3)_AUTORECONF_OPT) + $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS) endif $(2)_CONF_ENV ?= @@ -228,7 +228,7 @@ # define AUTORECONF_HOOK @$$(call MESSAGE,"Autoreconfiguring") - $$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT) + $$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPTS) $$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \ for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \ diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk --- a/package/webkit/webkit.mk +++ b/package/webkit/webkit.mk @@ -17,7 +17,7 @@ # webkit-disable-tests.patch changes configure.ac therefore autoreconf required WEBKIT_AUTORECONF = YES -WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools +WEBKIT_AUTORECONF_OPTS = -I $(@D)/Source/autotools # parallel make install deadlocks with make 3.81 WEBKIT_INSTALL_STAGING_OPTS = -j1 DESTDIR=$(STAGING_DIR) install