Patchwork [1/1] vala: add dependencies on native packages

login
register
mail settings
Submitter Joe Slater
Date April 7, 2014, 11:12 p.m.
Message ID <1396912345-7880-1-git-send-email-jslater@windriver.com>
Download mbox | patch
Permalink /patch/70225/
State New
Headers show

Comments

Joe Slater - April 7, 2014, 11:12 p.m.
We do not want to run the host xsltproc one time, and ours
another, so we add a dependency on libxslt-native.  We also
need to add a dependency on pkgconfig-native because the host
pkg-config will not see native packages we have built.

Signed-off-by: Joe Slater <jslater@windriver.com>
---
 meta/recipes-devtools/vala/vala.inc |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
Richard Purdie - April 8, 2014, 4:54 p.m.
On Mon, 2014-04-07 at 16:12 -0700, Joe Slater wrote:
> We do not want to run the host xsltproc one time, and ours
> another, so we add a dependency on libxslt-native.  We also
> need to add a dependency on pkgconfig-native because the host
> pkg-config will not see native packages we have built.
> 
> Signed-off-by: Joe Slater <jslater@windriver.com>
> ---
>  meta/recipes-devtools/vala/vala.inc |   11 +++++++++--
>  1 files changed, 9 insertions(+), 2 deletions(-)

Could you send something against master please?

Specifically, master has:

DEPENDS = "bison-native flex-native libxslt-native"

so this is half fixed there...

Cheers,

Richard

> diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc
> index a8927d7..9d273aa 100644
> --- a/meta/recipes-devtools/vala/vala.inc
> +++ b/meta/recipes-devtools/vala/vala.inc
> @@ -3,7 +3,13 @@ Vala compiles to plain C and has no runtime environment nor penalities whatsoeve
>  SECTION = "devel"
>  DEPENDS = "glib-2.0 dbus gtk+"
>  BBCLASSEXTEND = "native"
> -DEPENDS_virtclass-native = "bison-native glib-2.0-native dbus-native"
> +
> +# libxslt provides xsltproc, which is probably on the host, but we want to use ours.
> +# We need our pkg-config, too.  (Inheriting pkgconfig supplies that dependency, but
> +# we clobber it here).
> +#
> +DEPENDS_virtclass-native = "bison-native glib-2.0-native dbus-native libxslt-native pkgconfig-native"
> +
>  HOMEPAGE = "http://vala-project.org"
>  LICENSE = "LGPLv2.1"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
> @@ -12,7 +18,8 @@ INC_PR = "r1"
>  SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
>  
>  SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz"
> -inherit autotools
> +
> +inherit autotools pkgconfig
>  
>  EXTRA_OECONF = "--disable-vapigen"
>  
> -- 
> 1.7.3.4
>

Patch

diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc
index a8927d7..9d273aa 100644
--- a/meta/recipes-devtools/vala/vala.inc
+++ b/meta/recipes-devtools/vala/vala.inc
@@ -3,7 +3,13 @@  Vala compiles to plain C and has no runtime environment nor penalities whatsoeve
 SECTION = "devel"
 DEPENDS = "glib-2.0 dbus gtk+"
 BBCLASSEXTEND = "native"
-DEPENDS_virtclass-native = "bison-native glib-2.0-native dbus-native"
+
+# libxslt provides xsltproc, which is probably on the host, but we want to use ours.
+# We need our pkg-config, too.  (Inheriting pkgconfig supplies that dependency, but
+# we clobber it here).
+#
+DEPENDS_virtclass-native = "bison-native glib-2.0-native dbus-native libxslt-native pkgconfig-native"
+
 HOMEPAGE = "http://vala-project.org"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
@@ -12,7 +18,8 @@  INC_PR = "r1"
 SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz"
-inherit autotools
+
+inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-vapigen"