[PATCH 1/2] shared-mime-info, avahi, polkit: inherit perlnative

[PATCH 1/2] shared-mime-info, avahi, polkit: inherit perlnative

[Khem Raj]

Otherwise we end up with configure errors like below

| checking for perl... /usr/bin/perl
| checking for perl >= 5.8.1... 5.12.4
| checking for XML::Parser... configure: error: XML::Parser perl module is required for intltool
| + bbfatal 'oe_runconf failed'
| + echo 'ERROR: oe_runconf failed'
| ERROR: oe_runconf failed

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-connectivity/avahi/avahi.inc          |    2 +-
 meta/recipes-connectivity/avahi/avahi_0.6.30.bb    |    2 +-
 meta/recipes-extended/polkit/polkit_0.101.bb       |    4 ++--
 .../shared-mime-info/shared-mime-info.inc          |    2 +-
 .../shared-mime-info/shared-mime-info_0.90.bb      |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index dc7a5ae..5695403 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -21,7 +21,7 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
           file://99avahi-autoipd \
           file://initscript.patch"
 
-inherit autotools pkgconfig update-rc.d gettext
+inherit autotools pkgconfig update-rc.d gettext perlnative
 
 EXTRA_OECONF = "--with-distro=debian \
              --with-avahi-priv-access-group=adm \
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
index 05716d0..da40426 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
                     file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
 SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"
diff --git a/meta/recipes-extended/polkit/polkit_0.101.bb b/meta/recipes-extended/polkit/polkit_0.101.bb
index 06ca595..1dde885 100644
--- a/meta/recipes-extended/polkit/polkit_0.101.bb
+++ b/meta/recipes-extended/polkit/polkit_0.101.bb
@@ -11,12 +11,12 @@ SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
            ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
 
 PAM_SRC_URI = "file://polkit-1_pam.patch"
-PR = "r1"
+PR = "r2"
 DEPENDS = "libpam expat dbus-glib eggdbus intltool-native"
 RDEPENDS_${PN} = "libpam"
 EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig perlnative
 
 FILES_${PN} += "${libdir}/${PN}-1/extensions/*.so \
                 ${datadir}/${PN}-1/actions/* \
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
index 64eef9d..8b10535 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
@@ -10,7 +10,7 @@ DEPENDS_virtclass-native = "libxml2-native intltool-native glib-2.0-native"
 
 SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.bz2"
 
-inherit autotools pkgconfig gettext
+inherit autotools pkgconfig gettext perlnative
 
 EXTRA_OECONF = "--disable-update-mimedb"
 
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb
index cbbd0fe..4c852fa 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb
@@ -1,5 +1,5 @@
 require shared-mime-info.inc
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://fix-parallel-build.patch \
             file://fix-parallel-build-backport.patch \
-- 
1.7.5.4

[PATCH 2/2] qemu: Poke more paths for presence of libgl

[Khem Raj]

On ubuntu 11.10 libGL is not in
/usr/lib/`uname -i`-linux-gnu/ directory
so we search this dir too.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/qemu/qemu.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index ac8a3eb..85476d6 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -26,6 +26,7 @@ do_configure_prepend_virtclass-native() {
 
     test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes'
     test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes'
+    test -e /usr/lib/`uname -i`-linux-gnu/libGL.so -a -e /usr/lib/`uname -i`-linux-gnu/libGLU.so && libgl='yes'
 
     test -e /usr/lib/pkgconfig/sdl.pc -o -e /usr/lib64/pkgconfig/sdl.pc -o -e /usr/include/SDL/SDL.h && libsdl='yes'
 
-- 
1.7.5.4

Re: [PATCH 2/2] qemu: Poke more paths for presence of libgl

[Richard Purdie]

On Sun, 2011-08-07 at 23:14 -0700, Khem Raj wrote:
> On ubuntu 11.10 libGL is not in
> /usr/lib/`uname -i`-linux-gnu/ directory
> so we search this dir too.
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-devtools/qemu/qemu.inc |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Merged to master, thanks.

Richard

Re: [PATCH 1/2] shared-mime-info, avahi, polkit: inherit perlnative

[Richard Purdie]

On Sun, 2011-08-07 at 23:14 -0700, Khem Raj wrote:
> Otherwise we end up with configure errors like below
> 
> | checking for perl... /usr/bin/perl
> | checking for perl >= 5.8.1... 5.12.4
> | checking for XML::Parser... configure: error: XML::Parser perl module is required for intltool
> | + bbfatal 'oe_runconf failed'
> | + echo 'ERROR: oe_runconf failed'
> | ERROR: oe_runconf failed
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>

We really need to tweak intltool's m4 file so we don't need to add in
this ton of dependencies unnecessarily...

Cheers,

Richard

Re: [PATCH 1/2] shared-mime-info, avahi, polkit: inherit perlnative

[Khem Raj]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/08/2011 04:24 PM, Richard Purdie wrote:
> On Sun, 2011-08-07 at 23:14 -0700, Khem Raj wrote:
>> Otherwise we end up with configure errors like below
>> 
>> | checking for perl... /usr/bin/perl | checking for perl >=
>> 5.8.1... 5.12.4 | checking for XML::Parser... configure: error:
>> XML::Parser perl module is required for intltool | + bbfatal
>> 'oe_runconf failed' | + echo 'ERROR: oe_runconf failed' | ERROR:
>> oe_runconf failed
>> 
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> 
> We really need to tweak intltool's m4 file so we don't need to add
> in this ton of dependencies unnecessarily...
> 

intltool.m4 uses

AC_PATH_PROG(INTLTOOL_PERL,perl)


if test -z "$INTLTOOL_PERL"; then


   AC_MSG_ERROR([perl not found])


fi



its using AC_PATH_PROG to find perl which is quite right I think.
We somehow have to make sure that the path to perl-native
is added into environment which does not happen unless
we inherit perlnative as of now. and perlnative class is

PATH_prepend = "${STAGING_BINDIR_NATIVE}/perl-native:"


DEPENDS += "perl -native"


are you proposing that we hardcode path to perl-native in intltool
macros and assume that perl-native is already built ? or something else

> Cheers,
> 
> Richard
> 
> 
> _______________________________________________ Openembedded-core
> mailing list Openembedded-core@lists.openembedded.org 
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core


- --
> 
- -Khem
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk5Al6MACgkQuwUzVZGdMxTdLQCcCEgIWU2zgB5MZ6W2TMItR4ts
cHoAnR9D/n1wTbSjRWWRBzZiO/OxU08i
=tD34
-----END PGP SIGNATURE-----

Re: [PATCH 1/2] shared-mime-info, avahi, polkit: inherit perlnative

[Richard Purdie]

On Mon, 2011-08-08 at 19:12 -0700, Khem Raj wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> On 08/08/2011 04:24 PM, Richard Purdie wrote:
> > On Sun, 2011-08-07 at 23:14 -0700, Khem Raj wrote:
> >> Otherwise we end up with configure errors like below
> >> 
> >> | checking for perl... /usr/bin/perl | checking for perl >=
> >> 5.8.1... 5.12.4 | checking for XML::Parser... configure: error:
> >> XML::Parser perl module is required for intltool | + bbfatal
> >> 'oe_runconf failed' | + echo 'ERROR: oe_runconf failed' | ERROR:
> >> oe_runconf failed
> >> 
> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > 
> > We really need to tweak intltool's m4 file so we don't need to add
> > in this ton of dependencies unnecessarily...
> > 
> 
> intltool.m4 uses
> 
> AC_PATH_PROG(INTLTOOL_PERL,perl)
> 
> 
> if test -z "$INTLTOOL_PERL"; then
> 
> 
>    AC_MSG_ERROR([perl not found])
> 
> 
> fi
> 
> 
> 
> its using AC_PATH_PROG to find perl which is quite right I think.
> We somehow have to make sure that the path to perl-native
> is added into environment which does not happen unless
> we inherit perlnative as of now. and perlnative class is
> 
> PATH_prepend = "${STAGING_BINDIR_NATIVE}/perl-native:"
> 
> 
> DEPENDS += "perl -native"
> 
> 
> are you proposing that we hardcode path to perl-native in intltool
> macros and assume that perl-native is already built ? or something else

I was proposing we change 
AC_PATH_PROG(INTLTOOL_PERL,perl) 
to 
AC_PATH_PROG(INTLTOOL_PERL,nativeperl)

Cheers,

Richard

Re: [PATCH 1/2] shared-mime-info, avahi, polkit: inherit perlnative

[Khem Raj]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


> I was proposing we change AC_PATH_PROG(INTLTOOL_PERL,perl) to 
> AC_PATH_PROG(INTLTOOL_PERL,nativeperl)

I see. I will test it out and resubmit

> 
> Cheers,
> 
> Richard
> 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk5BT5YACgkQuwUzVZGdMxRBJgCfZal6iToBIKUmitPcFGOA/AkE
z+oAnin/cNDyGxFRUlTiSM59WMKMPZhs
=TW7i
-----END PGP SIGNATURE-----