Misc build fixes v2
cover Misc build fixes v2
This series includes a corrected fix for gst-plugins-base for make 3.82 as well as a more correct fix to enable gthumb to build on a system without gtk-doc installed.
We do this by providing a gtk-doc-native recipe and having gtk-doc depend on it. That way we have a binary to run on the build system to generate the documentation as well as a target version so that the pkgconfig test passes.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: josh/make-382
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=josh/make-382
Thanks,
Joshua Lock <[email protected]>
---
Joshua Lock (3):
gst-plugins: fix for make 3.82
gnome-common: add native variant via BBCLASSEXTEND
gnome-doc-utils: ensure a native variant exists for document
generation
meta/recipes-gnome/gnome/gnome-common_2.28.0.bb | 2 + .../gnome/gnome-doc-utils-native_0.20.2.bb | 7 +++++ meta/recipes-gnome/gnome/gnome-doc-utils.inc | 4 +-- .../gstreamer/gst-plugins-base_0.10.30.bb | 5 ++- meta/recipes-multimedia/gstreamer/gst-plugins.inc | 2 + .../gstreamer/gst-plugins/make-382.patch | 25 ++++++++++++++++++++ 6 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils-native_0.20.2.bb create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch
Signature · 1 line
1.7.3.3
PATCH 1/3 gst-plugins: fix for make 3.82
--- .../gstreamer/gst-plugins-base_0.10.30.bb | 5 ++- meta/recipes-multimedia/gstreamer/gst-plugins.inc | 2 + .../gstreamer/gst-plugins/make-382.patch | 25 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch
meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb +3 -2
@@ -10,12 +10,13 @@ DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis l RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ gnome-vfs-plugin-sftp" -SRC_URI += " file://gst-plugins-base-tremor.patch" +SRC_URI += " file://gst-plugins-base-tremor.patch \ + file://make-382.patch" SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c" SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7" -PR = "r1" +PR = "r2" inherit gettext
meta/recipes-multimedia/gstreamer/gst-plugins.inc +2 -0
@@ -7,6 +7,8 @@ DEPENDS = "gstreamer" inherit autotools pkgconfig +FILESPATH =. "${FILE_DIRNAME}/gst-plugins:" + SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch new file +25 -0
@@ -0,0 +1,25 @@ +Index: gst-plugins-base-0.10.29/common/gtk-doc-plugins.mak +=================================================================== +--- gst-plugins-base-0.10.29.orig/common/gtk-doc-plugins.mak ++++ gst-plugins-base-0.10.29/common/gtk-doc-plugins.mak +@@ -352,7 +352,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +Index: gst-plugins-base-0.10.29/common/gtk-doc.mak +=================================================================== +--- gst-plugins-base-0.10.29.orig/common/gtk-doc.mak ++++ gst-plugins-base-0.10.29/common/gtk-doc.mak +@@ -232,6 +232,6 @@ dist-hook: dist-check-gtkdoc dist-hook-l + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs
Signature · 1 line
1.7.3.3
PATCH 2/3 gnome-common: add native variant via BBCLASSEXTEND
In reply to Joshua Lock--- meta/recipes-gnome/gnome/gnome-common_2.28.0.bb | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
meta/recipes-gnome/gnome/gnome-common_2.28.0.bb +2 -0
@@ -25,3 +25,5 @@ DEPENDS = "" FILES_${PN} += "${datadir}/aclocal" FILES_${PN}-dev = "" + +BBCLASSEXTEND = "native"
Signature · 1 line
1.7.3.3
PATCH 3/3 gnome-doc-utils: ensure a native variant exists for document generation
In reply to Joshua Lockgnome-doc-utils-native must be available to do the build time generation of documentation however most gnome projects will do a pkgconfig check for the host version of gnome-doc-utils.
This patch adds gnome-doc-utils-native and makes gnome-doc-utils depend on it so that recipe writers can just add gnome-doc-utils to their DEPENDS and the system will do the right thing.
--- .../gnome/gnome-doc-utils-native_0.20.2.bb | 7 +++++++ meta/recipes-gnome/gnome/gnome-doc-utils.inc | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils-native_0.20.2.bb
meta/recipes-gnome/gnome/gnome-doc-utils-native_0.20.2.bb new file +7 -0
@@ -0,0 +1,7 @@ +require gnome-doc-utils_${PV}.bb + +inherit native + +DEPENDS = "libxml2-native libxslt-native" + +PR = "r0"
meta/recipes-gnome/gnome/gnome-doc-utils.inc +1 -3
@@ -1,7 +1,5 @@ LICENSE = "GPL LGPL" -DEPENDS = "libxml2 libxslt libxslt-native" - -PR = "r1" +DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native" inherit gnome
Signature · 1 line
1.7.3.3
Dear Joshua Lock,
Quoted 11 lines · In message <[email protected]> you wrote:
This series includes a corrected fix for gst-plugins-base for make 3.82 as well as a more correct fix to enable gthumb to build on a system without gtk-doc installed.
We do this by providing a gtk-doc-native recipe and having gtk-doc depend on it. That way we have a binary to run on the build system to generate the documentation as well as a target version so that the pkgconfig test passes.
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: josh/make-382
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=josh/make-382
I confirm that I can build both poky-image-sdk and meta-toolchain-sdk for "qemuppc" on Fedora 14 / x86_64 with these patches.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [email protected] A Freudian slip is when you say one thing but mean your mother.
Quoted 11 lines · Wolfgang Denk
Dear Joshua Lock,
Quoted 8 lines · In message <[email protected]> you wrote:
This series includes a corrected fix for gst-plugins-base for make 3.82 as well as a more correct fix to enable gthumb to build on a system without gtk-doc installed.
We do this by providing a gtk-doc-native recipe and having gtk-doc depend on it. That way we have a binary to run on the build system to generate the documentation as well as a target version so that the pkgconfig test passes.
Quoted 8 lines
Quoted 3 lines
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: josh/make-382
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=josh/make-382I confirm that I can build both poky-image-sdk and meta-toolchain-sdk for "qemuppc" on Fedora 14 /
x86_64with these patches.Tested-by Wolfgang Denk <[email protected]>
Great, I'm pleased this is working better now. Thanks for reporting back!
(and thanks Joshua for sorting the issues!)
Cheers,
Richard