[Buildroot] [PATCH v5 0/2] rpi-userland/xbmc fix

[Buildroot] [PATCH v5 0/2] rpi-userland/xbmc fix

[Samuel Martin]

Hi all,

Here is a quick fix between rpi-useland and xbmc, which is originally
taken from the CMake infrastructure refactoring series (hence the v5).

Yours,
Samuel

Samuel Martin (2):
  xbmc: fix missing libraries from rpi-userland
  rpi-userland: cleanup *_CONF_OPT

 package/rpi-userland/rpi-userland.mk | 2 +-
 package/xbmc/xbmc.mk                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

--
1.9.2

[Buildroot] [PATCH v5 1/2] xbmc: fix missing libraries from rpi-userland

[Samuel Martin]

When rpi-userland libraries are built as shared-objects, not all needed
libraries are passed in the LD_FLAGS, leading to failure at linkage.

To avoid this issue, set the LIBS variable content in accordance with the
INCLUDES variable value.

The commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf currently works
around this issue by forcing rpi-userland to be statically linked,
whereas it is actually a LIBS flags problem in xbmc package.

A follow-up patch fixes rpi-userland package.

Reported-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
changes v4 -> v5:
- rebase
- extend commit message

changes v3 -> v4:
- rebase

changes v2 -> v3:
- new patch
---
 package/xbmc/xbmc.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index c7a4607..8c0146e 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -53,7 +53,8 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
 XBMC_DEPENDENCIES += rpi-userland
 XBMC_CONF_OPT += --with-platform=raspberry-pi --enable-player=omxplayer
 XBMC_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
-	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"
+	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \
+	LIBS="-lvcos -lvchostif"
 endif
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
-- 
1.9.2

[Buildroot] [PATCH v5 1/2] xbmc: fix missing libraries from rpi-userland

[Yann E. MORIN]

Samuel, All,

On 2014-06-04 13:14 +0200, Samuel Martin spake thusly:
> When rpi-userland libraries are built as shared-objects, not all needed
> libraries are passed in the LD_FLAGS, leading to failure at linkage.
> 
> To avoid this issue, set the LIBS variable content in accordance with the
> INCLUDES variable value.
> 
> The commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf currently works
> around this issue by forcing rpi-userland to be statically linked,
> whereas it is actually a LIBS flags problem in xbmc package.
> 
> A follow-up patch fixes rpi-userland package.
> 
> Reported-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>

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

Regards,
Yann E. MORIN.

> ---
> changes v4 -> v5:
> - rebase
> - extend commit message
> 
> changes v3 -> v4:
> - rebase
> 
> changes v2 -> v3:
> - new patch
> ---
>  package/xbmc/xbmc.mk | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
> index c7a4607..8c0146e 100644
> --- a/package/xbmc/xbmc.mk
> +++ b/package/xbmc/xbmc.mk
> @@ -53,7 +53,8 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
>  XBMC_DEPENDENCIES += rpi-userland
>  XBMC_CONF_OPT += --with-platform=raspberry-pi --enable-player=omxplayer
>  XBMC_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
> -	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"
> +	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \
> +	LIBS="-lvcos -lvchostif"
>  endif
>  
>  ifeq ($(BR2_PACKAGE_DBUS),y)
> -- 
> 1.9.2
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH v5 2/2] rpi-userland: cleanup *_CONF_OPT

[Samuel Martin]

This change reverts the commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf
because rpi-userland is correctly built whatever the value of the
BUILD_SHARED_LIBS CMake flags.

The cset 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf originally intends to
fix linkage/runtime failure in xbmc package because of missing flags in
xbmc LIBS env. var. This has been fixed in the previous patch.

So, for rpi-userland package, BUILD_SHARED_LIBS does no longer need to
be forced to OFF, and can safely be driven by the CMake infrastructure.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

---
changes v4 -> v5:
- rebase
- extend commit log (ThomasP)

changes v3 -> v4:
- rebase

changes v2 -> v3:
- new patch
---
 package/rpi-userland/rpi-userland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index 8b225ba..2de6b92 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -9,7 +9,7 @@ RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE
 RPI_USERLAND_INSTALL_STAGING = YES
-RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=OFF
+RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
 
 RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
 
-- 
1.9.2

[Buildroot] [PATCH v5 2/2] rpi-userland: cleanup *_CONF_OPT

[Yann E. MORIN]

Samuel, All,

On 2014-06-04 13:14 +0200, Samuel Martin spake thusly:
> This change reverts the commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf
> because rpi-userland is correctly built whatever the value of the
> BUILD_SHARED_LIBS CMake flags.
> 
> The cset 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf originally intends to
> fix linkage/runtime failure in xbmc package because of missing flags in
> xbmc LIBS env. var. This has been fixed in the previous patch.
> 
> So, for rpi-userland package, BUILD_SHARED_LIBS does no longer need to
> be forced to OFF, and can safely be driven by the CMake infrastructure.
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

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

Of course, don't forget to include the two new other patches before that
one. ;-)

Regards,
Yann E. MORIN.

> ---
> changes v4 -> v5:
> - rebase
> - extend commit log (ThomasP)
> 
> changes v3 -> v4:
> - rebase
> 
> changes v2 -> v3:
> - new patch
> ---
>  package/rpi-userland/rpi-userland.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
> index 8b225ba..2de6b92 100644
> --- a/package/rpi-userland/rpi-userland.mk
> +++ b/package/rpi-userland/rpi-userland.mk
> @@ -9,7 +9,7 @@ RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
>  RPI_USERLAND_LICENSE = BSD-3c
>  RPI_USERLAND_LICENSE_FILES = LICENCE
>  RPI_USERLAND_INSTALL_STAGING = YES
> -RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=OFF
> +RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
>  
>  RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
>  
> -- 
> 1.9.2
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'