On Fri, Sep 28, 2012 at 8:35 AM, Andreas Müller <[email protected]> wrote: > Signed-off-by: Andreas Müller <[email protected]> > --- > ...gnome-doc-utils.make-sysrooted-pkg-config.patch | 51 > ++++++++++++++++++++ > meta-oe/recipes-devtools/glade/glade3_3.8.2.bb | 19 +++++++ > 2 files changed, 70 insertions(+), 0 deletions(-) > create mode 100644 > meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch > create mode 100644 meta-oe/recipes-devtools/glade/glade3_3.8.2.bb > > diff --git > a/meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch > > b/meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch > new file mode 100644 > index 0000000..1b24c39 > --- /dev/null > +++ > b/meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch > @@ -0,0 +1,51 @@ > +From aed002cd9ff9e8f972120fbac33b4a65aba952e1 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> > +Date: Tue, 25 Sep 2012 10:28:33 +0200 > +Subject: [PATCH] gnome-doc-utils.make: sysrooted pkg-config > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +same approach as used used in gnome-disk-utility: > + > +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: Andreas Müller <[email protected]> > +--- > + gnome-doc-utils.make | 10 +++++----- > + 1 files changed, 5 insertions(+), 5 deletions(-) > + > +diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make > +index 42d9df3..f71bbfa 100644 > +--- a/gnome-doc-utils.make > ++++ b/gnome-doc-utils.make > +@@ -133,11 +133,11 @@ _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` > +-_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` > ++_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}`$(PKG_CONFIG) --variable xmldir > gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl > + > + if ENABLE_SK > + _ENABLE_SK = true > +-- > +1.7.6.5 > + > diff --git a/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb > b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb > new file mode 100644 > index 0000000..8cd6a0e > --- /dev/null > +++ b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb > @@ -0,0 +1,19 @@ > +DESCRIPTION = "Glade - A User Interface Designer" > +HOMEPAGE = "http://www.gnu.org/software/gnash"; > +LICENSE = "GPLv2 & LGPLv2" > +LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ > + file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" > +DEPENDS = "gtk+ gnome-doc-utils-native" > + > +inherit autotools pkgconfig pythonnative > + > +SRC_URI = > "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \ > + file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch" > +SRC_URI[md5sum] = "b5da0ce717b2dc710e93a10b97c0f9ce" > +SRC_URI[sha256sum] = > "f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d388b19" > + > +EXTRA_OECONF += "--disable-scrollkeeper" > + > +FILES_${PN} += "${datadir}/icons" > +FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug" > +FILES_${PN}-dev += "${libdir}/glade3/modules/*.la" > -- > 1.7.4.4 > Patchwork does not like the third of this series. So this series can be found at
git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git branch patches Andreas _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
