Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] vlc: fix build when Qt4 development files are installed on the host
@ 2014-10-08 21:11 Thomas Petazzoni
  2014-10-08 21:19 ` Yann E. MORIN
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2014-10-08 21:11 UTC (permalink / raw)
  To: 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 <thomas.petazzoni@free-electrons.com>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 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
-- 
2.0.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH] vlc: fix build when Qt4 development files are installed on the host
  2014-10-08 21:11 [Buildroot] [PATCH] vlc: fix build when Qt4 development files are installed on the host Thomas Petazzoni
@ 2014-10-08 21:19 ` Yann E. MORIN
  2014-10-10 11:07 ` Vicente Olivert Riera
  2014-10-10 21:58 ` Peter Korsgaard
  2 siblings, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2014-10-08 21:19 UTC (permalink / raw)
  To: buildroot

Thomas, All,

On 2014-10-08 23:11 +0200, Thomas Petazzoni spake thusly:
> 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 <thomas.petazzoni@free-electrons.com>
> Cc: Bernd Kuhls <bernd.kuhls@t-online.de>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  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
> -- 
> 2.0.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH] vlc: fix build when Qt4 development files are installed on the host
  2014-10-08 21:11 [Buildroot] [PATCH] vlc: fix build when Qt4 development files are installed on the host Thomas Petazzoni
  2014-10-08 21:19 ` Yann E. MORIN
@ 2014-10-10 11:07 ` Vicente Olivert Riera
  2014-10-10 21:58 ` Peter Korsgaard
  2 siblings, 0 replies; 4+ messages in thread
From: Vicente Olivert Riera @ 2014-10-10 11:07 UTC (permalink / raw)
  To: buildroot

Dear Thomas Petazzoni,

On 10/08/2014 10:11 PM, Thomas Petazzoni wrote:
> 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 <thomas.petazzoni@free-electrons.com>
> Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>   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
>

Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

It also fixes the autobuild failure on MIPS:

 
http://autobuild.buildroot.net/results/06174eaeb7f2b8a591395e607912ad72623b79e3/

-- 
Vicente Olivert Riera
Graduate Software Engineer, MIPS Processor IP
Imagination Technologies Limited
t: +44 (0)113 2429814
www.imgtec.com

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH] vlc: fix build when Qt4 development files are installed on the host
  2014-10-08 21:11 [Buildroot] [PATCH] vlc: fix build when Qt4 development files are installed on the host Thomas Petazzoni
  2014-10-08 21:19 ` Yann E. MORIN
  2014-10-10 11:07 ` Vicente Olivert Riera
@ 2014-10-10 21:58 ` Peter Korsgaard
  2 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2014-10-10 21:58 UTC (permalink / raw)
  To: buildroot

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > 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 <thomas.petazzoni@free-electrons.com>
 > Cc: Bernd Kuhls <bernd.kuhls@t-online.de>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-10-10 21:58 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-08 21:11 [Buildroot] [PATCH] vlc: fix build when Qt4 development files are installed on the host Thomas Petazzoni
2014-10-08 21:19 ` Yann E. MORIN
2014-10-10 11:07 ` Vicente Olivert Riera
2014-10-10 21:58 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox