From patchwork Wed Oct 8 21:11:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 397804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id A57C11400D5 for ; Thu, 9 Oct 2014 08:11:13 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C267A95D80; Wed, 8 Oct 2014 21:11:12 +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 fM0C3s48asfH; Wed, 8 Oct 2014 21:11:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 0FBBB95CDE; Wed, 8 Oct 2014 21:11:11 +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 79B371C1EDA for ; Wed, 8 Oct 2014 21:11:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 727E0926CC for ; Wed, 8 Oct 2014 21:11:10 +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 x63ohuZXBRfz for ; Wed, 8 Oct 2014 21:11:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by whitealder.osuosl.org (Postfix) with ESMTP id 8F31B926BC for ; Wed, 8 Oct 2014 21:11:09 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 9FBD76D5; Wed, 8 Oct 2014 23:11:11 +0200 (CEST) Received: from localhost (AToulouse-657-1-1025-243.w90-45.abo.wanadoo.fr [90.45.71.243]) by mail.free-electrons.com (Postfix) with ESMTPSA id 40CD31BE; Wed, 8 Oct 2014 23:11:11 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Wed, 8 Oct 2014 23:11:07 +0200 Message-Id: <1412802667-22749-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.0.0 Cc: Thomas Petazzoni , Bernd Kuhls Subject: [Buildroot] [PATCH] vlc: fix build when Qt4 development files are installed on the host 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When Qt4 development files are installed on the host, VLC uses /usr/bin/moc, /usr/bin/uic and /usr/bin/rcc when Qt support is enabled. However, those host installed versions are not necessarily compatible with the Qt version used in Buildroot, causes some build failures. This commit therefore passes explicit ac_cv_path_MOC, ac_cv_path_RCC and ac_cv_path_UIC variables to make sure the Qt host tools built by Buildroot are used. Note that the VLC configure.ac script uses 'pkg-config --variable=exec_prefix QtCore' to find the location of such tools, but this invocation returns /usr. One solution would have been to extend the pkgconf-01-fix-variable.patch we have against pkgconf to also cover exec_prefix, but this has more uncertain consequences than just fixing VLC. Fixes: http://autobuild.buildroot.org/results/061/06174eaeb7f2b8a591395e607912ad72623b79e3/ Signed-off-by: Thomas Petazzoni Cc: Bernd Kuhls Reviewed-by: "Yann E. MORIN" Tested-by: Vicente Olivert Riera --- package/vlc/vlc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 0b275f2..13c72ce 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -251,6 +251,10 @@ endif ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y) VLC_CONF_OPTS += --enable-qt +VLC_CONF_ENV += \ + ac_cv_path_MOC=$(HOST_DIR)/usr/bin/moc \ + ac_cv_path_RCC=$(HOST_DIR)/usr/bin/rcc \ + ac_cv_path_UIC=$(HOST_DIR)/usr/bin/uic VLC_DEPENDENCIES += qt else VLC_CONF_OPTS += --disable-qt