* [PATCH] gnome-doc-utils: Prepend PKG_CONFIG_SYSROOT_DIR to the path returned from PKG_CONFIG
@ 2011-09-24 5:54 Khem Raj
2011-09-25 17:23 ` Richard Purdie
0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2011-09-24 5:54 UTC (permalink / raw)
To: openembedded-core
If we build say gnome based image on a build system which does not have
gnome e.g. kubuntu then packages like gedit do not build since it uses
gnome files from host system which are non existent on kubuntu
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../gnome-doc-utils/sysrooted-pkg-config.patch | 37 ++++++++++++++++++++
meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb | 6 ++-
2 files changed, 41 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
new file mode 100644
index 0000000..e17e8b4
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
@@ -0,0 +1,37 @@
+In cross environment we have to prepend the sysroot to the path found by
+pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
+it ends up using the files from host system. Now usually people have gnome installed
+so the build succeeds but if you dont have gnome installed on build host then
+it wont find the files on host system and packages using gnome-doc-utils wont
+compile.
+
+This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR
+will be empty
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: gnome-doc-utils-0.20.6/tools/gnome-doc-utils.make
+===================================================================
+--- gnome-doc-utils-0.20.6.orig/tools/gnome-doc-utils.make 2011-09-23 22:22:26.000000000 -0700
++++ gnome-doc-utils-0.20.6/tools/gnome-doc-utils.make 2011-09-23 22:30:03.479787196 -0700
+@@ -133,12 +133,12 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
+ _xml2po ?= `which xml2po`
+ _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
+
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
+
+ if ENABLE_SK
+ _ENABLE_SK = true
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
index c65cf64..9e3d4c4 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
@@ -1,10 +1,12 @@
require gnome-doc-utils.inc
LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
-PR = "r5"
+PR = "r6"
SRC_URI += "file://xsltproc_nonet.patch \
- file://use-usr-bin-env-for-python-in-xml2po.patch"
+ file://use-usr-bin-env-for-python-in-xml2po.patch \
+ file://sysrooted-pkg-config.patch \
+ "
SRC_URI[archive.md5sum] = "8f6e05071599bc073007830ea0a68391"
SRC_URI[archive.sha256sum] = "091486e370480bf45349ad09dac799211092a02938b26a0d68206172cb6cebbf"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] gnome-doc-utils: Prepend PKG_CONFIG_SYSROOT_DIR to the path returned from PKG_CONFIG
2011-09-24 5:54 [PATCH] gnome-doc-utils: Prepend PKG_CONFIG_SYSROOT_DIR to the path returned from PKG_CONFIG Khem Raj
@ 2011-09-25 17:23 ` Richard Purdie
2011-09-26 17:07 ` Khem Raj
0 siblings, 1 reply; 4+ messages in thread
From: Richard Purdie @ 2011-09-25 17:23 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-09-23 at 22:54 -0700, Khem Raj wrote:
> If we build say gnome based image on a build system which does not have
> gnome e.g. kubuntu then packages like gedit do not build since it uses
> gnome files from host system which are non existent on kubuntu
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../gnome-doc-utils/sysrooted-pkg-config.patch | 37 ++++++++++++++++++++
> meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb | 6 ++-
> 2 files changed, 41 insertions(+), 2 deletions(-)
> create mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
>
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnome-doc-utils: Prepend PKG_CONFIG_SYSROOT_DIR to the path returned from PKG_CONFIG
2011-09-25 17:23 ` Richard Purdie
@ 2011-09-26 17:07 ` Khem Raj
2011-09-26 17:46 ` Richard Purdie
0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2011-09-26 17:07 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sun, Sep 25, 2011 at 10:23 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Fri, 2011-09-23 at 22:54 -0700, Khem Raj wrote:
>> If we build say gnome based image on a build system which does not have
>> gnome e.g. kubuntu then packages like gedit do not build since it uses
>> gnome files from host system which are non existent on kubuntu
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> .../gnome-doc-utils/sysrooted-pkg-config.patch | 37 ++++++++++++++++++++
>> meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb | 6 ++-
>> 2 files changed, 41 insertions(+), 2 deletions(-)
>> create mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
>>
>
> Merged to master, thanks.
>
Richard
It does not appear in the pull I just did moments ago.
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnome-doc-utils: Prepend PKG_CONFIG_SYSROOT_DIR to the path returned from PKG_CONFIG
2011-09-26 17:07 ` Khem Raj
@ 2011-09-26 17:46 ` Richard Purdie
0 siblings, 0 replies; 4+ messages in thread
From: Richard Purdie @ 2011-09-26 17:46 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2011-09-26 at 10:07 -0700, Khem Raj wrote:
> On Sun, Sep 25, 2011 at 10:23 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > On Fri, 2011-09-23 at 22:54 -0700, Khem Raj wrote:
> >> If we build say gnome based image on a build system which does not have
> >> gnome e.g. kubuntu then packages like gedit do not build since it uses
> >> gnome files from host system which are non existent on kubuntu
> >>
> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> ---
> >> .../gnome-doc-utils/sysrooted-pkg-config.patch | 37 ++++++++++++++++++++
> >> meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb | 6 ++-
> >> 2 files changed, 41 insertions(+), 2 deletions(-)
> >> create mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch
> >>
> >
> > Merged to master, thanks.
> >
>
> Richard
>
> It does not appear in the pull I just did moments ago.
Sorry, not sure how that went wrong but I've merged it now...
Cheers,
Richard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-09-26 17:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-24 5:54 [PATCH] gnome-doc-utils: Prepend PKG_CONFIG_SYSROOT_DIR to the path returned from PKG_CONFIG Khem Raj
2011-09-25 17:23 ` Richard Purdie
2011-09-26 17:07 ` Khem Raj
2011-09-26 17:46 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox