[oe] [STABLE] Re: gnome-panel: Compile idl files against STAGING_DIR_HOST.

[Koen Kooi]

forgot the [STABLE] tag, sorry

On 09-04-09 18:00, Koen Kooi wrote:
> From: Stanislav Brabec<utx at penguin.cz>
>
> Adapted from the .dev patch to gnome-panel 2.24 since 2.26 isn't in stable yet
>
> Signed-off-by: Koen Kooi<koen at openembedded.org>
>
> ---
> diff --git a/recipes/gnome/gnome-panel/idl-sysroot.patch b/recipes/gnome/gnome-panel/idl-sysroot.patch
> new file mode 100644
> index 0000000..07e5ded
> --- a/dev/null
> +++ b/recipes/gnome/gnome-panel/idl-sysroot.patch
> @@ -0,0 +1,26 @@
> +Index: gnome-panel-2.24.0/gnome-panel/Makefile.am
> +===================================================================
> +--- gnome-panel-2.24.0.orig/gnome-panel/Makefile.am	2009-03-16 22:37:12.000000000 +0000
> ++++ gnome-panel-2.24.0/gnome-panel/Makefile.am	2009-04-09 14:39:02.000000000 +0000
> +@@ -43,7 +43,7 @@
> + 	$(NULL)
> +
> + $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
> +-	$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
> ++	$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
> +
> + BUILT_SOURCES = \
> + 	$(CORBA_SRCLIST)	\
> +Index: gnome-panel-2.24.0/libpanel-applet/Makefile.am
> +===================================================================
> +--- gnome-panel-2.24.0.orig/libpanel-applet/Makefile.am	2009-03-16 22:37:13.000000000 +0000
> ++++ gnome-panel-2.24.0/libpanel-applet/Makefile.am	2009-04-09 14:51:18.000000000 +0000
> +@@ -45,7 +45,7 @@
> + 	GNOME_Panel.h
> +
> + $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
> +-	$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
> ++	$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
> +
> + noinst_PROGRAMS = test-bonobo-applet
> +
> diff --git a/recipes/gnome/gnome-panel_2.24.0.bb b/recipes/gnome/gnome-panel_2.24.0.bb
> index 743e0fa..473bea4 100644
> --- a/recipes/gnome/gnome-panel_2.24.0.bb
> +++ b/recipes/gnome/gnome-panel_2.24.0.bb
> @@ -5,6 +5,8 @@ inherit gnome pkgconfig
>
>   SRC_URI += "file://scrollkeeper.patch;patch=1"
>
> +SRC_URI += "file://idl-sysroot.patch;patch=1"
> +
>   do_configure_prepend() {
>           sed -i -e s:help:: ${S}/Makefile.am
>   }
> @@ -16,7 +18,8 @@ FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
>   FILES_${PN} =+ "${datadir}/gnome* \
>                   ${datadir}/icons"
>
> -EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
> +export SYSROOT = "${STAGING_DIR_HOST}"
> +EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2 SYSROOT=${SYSROOT}"
>   EXTRA_OECONF = "--disable-scrollkeeper"
>
>   do_stage() {