htmldoc: remove -native recipes
The following patches switch htmldoc to BBCLASSEXTEND = "native".
1.8.27 is the same revision as ever. For 1.9.x I wanted to update to the latest snapshot revision at the same time but failed because gcc 4.4.3 reported far too many errors in the -native compile. So the recipe of 1.9.x is ready for updates (just select SVN revision) but it's still the same old rev 1571.
PATCH 1/3 htmldoc-gui_1.9.x: remove, there is no GUI code in developer snapshots
--- recipes/htmldoc/htmldoc-gui_1.9.x-r1571.bb | 27 --------------------------- 1 files changed, 0 insertions(+), 27 deletions(-) delete mode 100644 recipes/htmldoc/htmldoc-gui_1.9.x-r1571.bb
recipes/htmldoc/htmldoc-gui_1.9.x-r1571.bb deleted +0 -27
@@ -1,27 +0,0 @@ -require htmldoc.inc -DEPENDS += "htmldoc-native fltk" -PR = "r2" - - -SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-${PV}.tar.bz2 \ -file://paths_1.9.x.patch" - - -S = "${WORKDIR}/htmldoc-${PV}" - -inherit autotools pkgconfig - -EXTRA_AUTORECONF += "--exclude=autoheader" -EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \ - --with-gui=yes" - -FILES_${PN} += "${datadir}/htmldoc/fonts" -FILES_${PN} += "${datadir}/htmldoc/data" - - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -SRC_URI[md5sum] = "eda75ba1abe14ed8e71c6f40438def85" -SRC_URI[sha256sum] = "b4c78ff6b47521e980533e52cbe46fe86874c75b3d6bc18bcc2500a2ba854c3e"
Signature · 1 line
1.7.1
PATCH 2/3 htmldoc_1.9.x: merge native and non-native recipes
In reply to Vitus Jensen* switch to SVN fetch as the 1.9.x versions are work in progress, released by svn revisions not version numbers. Snapshot archives aren't always provided.
* add DEFAULT_PREFERENCE="-1", it's not the official release
--- recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb | 37 ------------------------ recipes/htmldoc/htmldoc_1.9.x-r1571.bb | 25 ---------------- recipes/htmldoc/htmldoc_1.9.x.bb | 38 +++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 62 deletions(-) delete mode 100644 recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb delete mode 100644 recipes/htmldoc/htmldoc_1.9.x-r1571.bb create mode 100644 recipes/htmldoc/htmldoc_1.9.x.bb
recipes/htmldoc/htmldoc-native_1.9.x-r1571.bb deleted +0 -37
@@ -1,37 +0,0 @@ -require htmldoc.inc -PR = "r2" - - -SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-${PV}.tar.bz2 \ -file://paths_1.9.x.patch" - - -inherit autotools native - -EXTRA_AUTORECONF += "--exclude=autoheader" -EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \ - --with-gui=no" - - -do_compile() { - cd htmldoc && oe_runmake all ; cd ${S} -} - - -do_stage () { - install -d ${STAGING_DATADIR}/htmldoc/fonts - install -m 0644 ${S}/fonts/*.afm ${STAGING_DATADIR}/htmldoc/fonts/ - install -m 0644 ${S}/fonts/*.pfa ${STAGING_DATADIR}/htmldoc/fonts/ - - install -d ${STAGING_DATADIR}/htmldoc/data - install -m 0644 ${S}/data/* ${STAGING_DATADIR}/htmldoc/data/ - - install -d ${STAGING_DIR_HOST}${layout_mandir}/man1 - install -m 0644 ${S}/doc/htmldoc.man ${STAGING_DIR_HOST}${layout_mandir}/man1/ - - install -d ${STAGING_BINDIR} - install -m 0755 ${S}/htmldoc/htmldoc ${STAGING_BINDIR}/ -} - -SRC_URI[md5sum] = "eda75ba1abe14ed8e71c6f40438def85" -SRC_URI[sha256sum] = "b4c78ff6b47521e980533e52cbe46fe86874c75b3d6bc18bcc2500a2ba854c3e"
recipes/htmldoc/htmldoc_1.9.x-r1571.bb deleted +0 -25
@@ -1,25 +0,0 @@ -require htmldoc.inc -DEPENDS += "htmldoc-native" -PR = "r2" - - -SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/snapshots/htmldoc-${PV}.tar.bz2 \ -file://paths_1.9.x.patch" - - -inherit autotools pkgconfig - -EXTRA_AUTORECONF += "--exclude=autoheader" -EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \ - --with-gui=no" - -FILES_${PN} += "${datadir}/htmldoc/fonts" -FILES_${PN} += "${datadir}/htmldoc/data" - - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -SRC_URI[md5sum] = "eda75ba1abe14ed8e71c6f40438def85" -SRC_URI[sha256sum] = "b4c78ff6b47521e980533e52cbe46fe86874c75b3d6bc18bcc2500a2ba854c3e"
recipes/htmldoc/htmldoc_1.9.x.bb new file +38 -0
@@ -0,0 +1,38 @@ +require htmldoc.inc +DEPENDS_pn-htmldoc += "htmldoc-native" + +# latest dev-snapshot: "1629" +SRCREV = "1571" +PV = "1.9.x+r${SRCPV}" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "svn://svn.easysw.com/public/htmldoc;module=trunk;proto=http \ + file://paths_1.9.x.patch \ + " +S = "${WORKDIR}/trunk" + +inherit autotools pkgconfig + +EXTRA_AUTORECONF += "--exclude=autoheader" +EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \ + " + +FILES_${PN} += "${datadir}/htmldoc/fonts" +FILES_${PN} += "${datadir}/htmldoc/data" + +BBCLASSEXTEND = "native" + +do_compile_virtclass-native() { + (cd htmldoc && oe_runmake all) +} +do_install_virtclass-native() { + (cd fonts && oe_runmake 'DESTDIR=${D}' install) + (cd data && oe_runmake 'DESTDIR=${D}' install) + (cd htmldoc && oe_runmake 'DESTDIR=${D}' install) +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +}
Signature · 1 line
1.7.1
PATCH 3/3 htmldoc_1.8.27:: merge native and non-native recipes
In reply to Vitus Jensen--- recipes/htmldoc/htmldoc-native_1.8.27.bb | 37 ------------------------------ recipes/htmldoc/htmldoc_1.8.27.bb | 17 +++++++++++-- 2 files changed, 14 insertions(+), 40 deletions(-) delete mode 100644 recipes/htmldoc/htmldoc-native_1.8.27.bb
recipes/htmldoc/htmldoc-native_1.8.27.bb deleted +0 -37
@@ -1,37 +0,0 @@ -require htmldoc.inc -PR = "r2" - - -SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/${PV}/htmldoc-${PV}-source.tar.bz2 \ -file://paths_1.8.27.patch" - - -inherit autotools native - -EXTRA_AUTORECONF += "--exclude=autoheader" -EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \ - --with-gui=no" - - -do_compile() { - cd htmldoc && oe_runmake all ; cd ${S} -} - - -do_stage () { - install -d ${STAGING_DATADIR}/htmldoc/fonts - install -m 0644 ${S}/fonts/*.afm ${STAGING_DATADIR}/htmldoc/fonts/ - install -m 0644 ${S}/fonts/*.pfa ${STAGING_DATADIR}/htmldoc/fonts/ - - install -d ${STAGING_DATADIR}/htmldoc/data - install -m 0644 ${S}/data/* ${STAGING_DATADIR}/htmldoc/data/ - - install -d ${STAGING_DIR_HOST}${layout_mandir}/man1 - install -m 0644 ${S}/doc/htmldoc.man ${STAGING_DIR_HOST}${layout_mandir}/man1/ - - install -d ${STAGING_BINDIR} - install -m 0755 ${S}/htmldoc/htmldoc ${STAGING_BINDIR}/ -} - -SRC_URI[md5sum] = "35589e7b8fe9c54e11be87cd5aec4dcc" -SRC_URI[sha256sum] = "89ffd223734268375dc959c200622dc5f167576c5cad9d7ce4bd7567faeb9613"
recipes/htmldoc/htmldoc_1.8.27.bb +14 -3
@@ -1,10 +1,11 @@ require htmldoc.inc -DEPENDS += "htmldoc-native" -PR = "r2" +DEPENDS_pn-htmldoc += "htmldoc-native" +PR = "r3" SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/htmldoc/${PV}/htmldoc-${PV}-source.tar.bz2 \ -file://paths_1.8.27.patch" + file://paths_1.8.27.patch \ + " inherit autotools pkgconfig
@@ -16,6 +17,16 @@ EXTRA_OECONF += "--disable-localpng --disable-localjpeg --disable-localzlib \ FILES_${PN} += "${datadir}/htmldoc/fonts" FILES_${PN} += "${datadir}/htmldoc/data" +BBCLASSEXTEND = "native" + +do_compile_virtclass-native() { + (cd htmldoc && oe_runmake all) +} +do_install_virtclass-native() { + (cd fonts && oe_runmake 'DESTDIR=${D}' install) + (cd data && oe_runmake 'DESTDIR=${D}' install) + (cd htmldoc && oe_runmake 'DESTDIR=${D}' install) +} do_install() { oe_runmake 'DESTDIR=${D}' install
Signature · 1 line
1.7.1
Quoted 6 lines · Vitus Jensen
The following patches switch htmldoc to BBCLASSEXTEND = "native".
1.8.27 is the same revision as ever. For 1.9.x I wanted to update to the latest snapshot revision at the same time but failed because gcc 4.4.3 reported far too many errors in the -native compile. So the recipe of 1.9.x is ready for updates (just select SVN revision) but it's still the same old rev 1571.
Something wrong with these recipes?
Vitus
Signature · 2 lines
Vitus Jensen, Hannover, Germany, Universe (current) pgp public key available from keyservers