diff mbox series

[2/2] package/freerdp: always uses pkg-config

Message ID f3ea53ecff0ea344fcc64197b75f4ee5be1ac09c.1509907598.git.yann.morin.1998@free.fr
State Changes Requested
Headers show
Series [1/2] package/freerdp: optional systemd's journald support | expand

Commit Message

Yann E. MORIN Nov. 5, 2017, 6:46 p.m. UTC
Currently, we only deopend on host-pkgconf for gstreamer-0.x

However, we also need it at least for gstreamer-1.x and waylabnd, too.

Make it a mandatory dependency, no matter what.

Partially fixes:
    http://autobuild.buildroot.org/results/81a/81aa66ddd88919295ccb5f34b527b737627263a7/
    http://autobuild.buildroot.org/results/bdf/bdfe233ade36a56d0f65ef3c3d1698fca548beed/

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/freerdp/freerdp.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Samuel Martin Nov. 5, 2017, 9:17 p.m. UTC | #1
Hi Yann,

On Sun, Nov 5, 2017 at 7:46 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Currently, we only deopend on host-pkgconf for gstreamer-0.x
>
> However, we also need it at least for gstreamer-1.x and waylabnd, too.
>
> Make it a mandatory dependency, no matter what.

Since freerdp uses the cmake infrastructure, it already has
host-pkgconf among its dependencies (c.f. [1])

Regards,

[1] https://git.buildroot.net/buildroot/tree/package/pkg-cmake.mk#n151
Yann E. MORIN Nov. 5, 2017, 9:22 p.m. UTC | #2
On 2017-11-05 22:17 +0100, Samuel Martin spake thusly:
> On Sun, Nov 5, 2017 at 7:46 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > Currently, we only deopend on host-pkgconf for gstreamer-0.x
> >
> > However, we also need it at least for gstreamer-1.x and waylabnd, too.
> >
> > Make it a mandatory dependency, no matter what.
> 
> Since freerdp uses the cmake infrastructure, it already has
> host-pkgconf among its dependencies (c.f. [1])

OK, god to know, indeed...

Then, that does not explain the errors we're seeing... Damned... :-(

I'll update the patch to just drop the depenency altogether, then.

Thanks!

Regards,
Yann E. MORIN.
Arnout Vandecappelle Nov. 5, 2017, 10:09 p.m. UTC | #3
On 05-11-17 22:22, Yann E. MORIN wrote:
> On 2017-11-05 22:17 +0100, Samuel Martin spake thusly:
>> On Sun, Nov 5, 2017 at 7:46 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>>> Currently, we only deopend on host-pkgconf for gstreamer-0.x
>>>
>>> However, we also need it at least for gstreamer-1.x and waylabnd, too.
>>>
>>> Make it a mandatory dependency, no matter what.
>>
>> Since freerdp uses the cmake infrastructure, it already has
>> host-pkgconf among its dependencies (c.f. [1])
> 
> OK, god to know, indeed...
> 
> Then, that does not explain the errors we're seeing... Damned... :-(

 I took a look at
http://autobuild.buildroot.org/results/bdf/bdfe233ade36a56d0f65ef3c3d1698fca548beed/build-end.log

 It errors on
.../output/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/wayland-scanner: No
such file or directory
i.e. it's trying to execute the staging wayland-scanner.

 Regards,
 Arnout

> 
> I'll update the patch to just drop the depenency altogether, then.
> 
> Thanks!
> 
> Regards,
> Yann E. MORIN.
>
Yann E. MORIN Nov. 5, 2017, 10:15 p.m. UTC | #4
Arnout, All,

On 2017-11-05 23:09 +0100, Arnout Vandecappelle spake thusly:
> On 05-11-17 22:22, Yann E. MORIN wrote:
> > On 2017-11-05 22:17 +0100, Samuel Martin spake thusly:
> >> On Sun, Nov 5, 2017 at 7:46 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> >>> Currently, we only deopend on host-pkgconf for gstreamer-0.x
> >>>
> >>> However, we also need it at least for gstreamer-1.x and waylabnd, too.
> >>>
> >>> Make it a mandatory dependency, no matter what.
> >>
> >> Since freerdp uses the cmake infrastructure, it already has
> >> host-pkgconf among its dependencies (c.f. [1])
> > 
> > OK, god to know, indeed...
> > 
> > Then, that does not explain the errors we're seeing... Damned... :-(
> 
>  I took a look at
> http://autobuild.buildroot.org/results/bdf/bdfe233ade36a56d0f65ef3c3d1698fca548beed/build-end.log

Yes, I'm revisitng the series as a whole: it turns out I did not have a
clean build tree, and something made it build ocally. Now, I can still
reproduce the issue with my patches...


>  It errors on
> .../output/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/wayland-scanner: No
> such file or directory
> i.e. it's trying to execute the staging wayland-scanner.

And that's becasue it uses whatever pkg-config provides, which is
obviously stupid and wrong for cross-compilation... Sigh... :-(

I'm revisiting the whole series...

Regards,
Yann E. MORIN.

>  Regards,
>  Arnout
> 
> > 
> > I'll update the patch to just drop the depenency altogether, then.
> > 
> > Thanks!
> > 
> > Regards,
> > Yann E. MORIN.
> > 
> 
> -- 
> Arnout Vandecappelle                          arnout at mind be
> Senior Embedded Software Architect            +32-16-286500
> Essensium/Mind                                http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
diff mbox series

Patch

diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk
index d6320de4c2..d5524c63ef 100644
--- a/package/freerdp/freerdp.mk
+++ b/package/freerdp/freerdp.mk
@@ -6,7 +6,7 @@ 
 
 FREERDP_VERSION = 2.0.0-rc0
 FREERDP_SITE = $(call github,FreeRDP,FreeRDP,$(FREERDP_VERSION))
-FREERDP_DEPENDENCIES = libglib2 openssl zlib
+FREERDP_DEPENDENCIES = libglib2 openssl zlib host-pkgconf
 FREERDP_LICENSE = Apache-2.0
 FREERDP_LICENSE_FILES = LICENSE
 
@@ -16,7 +16,7 @@  FREERDP_CONF_OPTS = -DWITH_MANPAGES=OFF -Wno-dev
 
 ifeq ($(BR2_PACKAGE_FREERDP_GSTREAMER),y)
 FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON
-FREERDP_DEPENDENCIES += gstreamer gst-plugins-base libxml2 host-pkgconf
+FREERDP_DEPENDENCIES += gstreamer gst-plugins-base libxml2
 else
 FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF
 endif