From patchwork Thu Feb 27 19:37:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 324899 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 A12F22C0097 for ; Fri, 28 Feb 2014 06:37:53 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6B6478C634; Thu, 27 Feb 2014 19:37:52 +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 z9SOZTgrgpVQ; Thu, 27 Feb 2014 19:37:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D27B18C45D; Thu, 27 Feb 2014 19:37:47 +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 40B401C24AF for ; Thu, 27 Feb 2014 19:37:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3E3269356A for ; Thu, 27 Feb 2014 19:37:46 +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 SCImaihnbSct for ; Thu, 27 Feb 2014 19:37:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6549393573 for ; Thu, 27 Feb 2014 19:37:41 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1WJ6qx-0007T7-4T; Thu, 27 Feb 2014 20:42:45 +0100 Received: from arnout by vandecaa-laptop with local (Exim 4.82) (envelope-from ) id 1WJ6ly-00073F-Rn; Thu, 27 Feb 2014 20:37:35 +0100 From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Thu, 27 Feb 2014 20:37:34 +0100 Message-Id: <1393529854-27070-1-git-send-email-arnout@mind.be> X-Mailer: git-send-email 1.9.0 Subject: [Buildroot] [PATCH] vlc: avoid that AUTORECONF renames configure's arguments 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net VLC defines two autoconf functions which are also defined by our own pkg.m4 from pkgconf. Unfortunately, they are defined in a different way: VLC adds --enable- options, but pkg.m4 adds --with- options. To make sure we use VLC's definition, rename these two functions from PKG_WITH_MODULES to VLC_PKG_WITH_MODULES and from PKG_HAVE_WITH_MODULES to VLC_PKG_HAVE_WITH_MODULES. Note that the second function (PKG_HAVE_WITH_MODULES) is in fact defined in exactly the same way by VLC and pkgconf, but this might no longer be the case when either pkgconf or VLC is updated. Therefore, that one is renamed as well. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Simon Dawson Tested-by: Simon Dawson --- I propose to apply this to next but not to master - Simon's patch 02004773 has been applied to master and fixes it as well. However, that means that 02004773 has to be reverted when next is merged into master. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/vlc/vlc.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 923439d..5727193 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -12,6 +12,17 @@ VLC_LICENSE_FILES = COPYING COPYING.LIB VLC_DEPENDENCIES = host-pkgconf VLC_AUTORECONF = YES +# VLC defines two autoconf functions which are also defined by our own pkg.m4 +# from pkgconf. Unfortunately, they are defined in a different way: VLC adds +# --enable- options, but pkg.m4 adds --with- options. To make sure we use +# VLC's definition, rename these two functions. +define VLC_OVERRIDE_PKG_M4 + $(SED) 's/PKG_WITH_MODULES/VLC_PKG_WITH_MODULES/g' \ + -e 's/PKG_HAVE_WITH_MODULES/VLC_PKG_HAVE_WITH_MODULES/g' \ + $(@D)/configure.ac $(@D)/m4/with_pkg.m4 +endef +VLC_POST_PATCH_HOOKS += VLC_OVERRIDE_PKG_M4 + VLC_CONF_OPT += \ --disable-a52 \ --disable-shout \