diff options
Diffstat (limited to 'meta-oe/recipes-navigation/gpsd/gpsd-3.14/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch')
| -rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-3.14/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.14/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.14/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch new file mode 100644 index 0000000000..8527f0db39 --- /dev/null +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.14/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch | |||
| @@ -0,0 +1,52 @@ | |||
| 1 | From 697e2e9ff97487266d817cdd41bacc83f681e3d7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Sun, 29 Apr 2012 00:05:59 +0200 | ||
| 4 | Subject: [PATCH 4/4] SConstruct: disable html and man docs building because | ||
| 5 | xmlto-native from OE is broken | ||
| 6 | |||
| 7 | It will try to load dtd and fail: | ||
| 8 | | xmlto man gpsctl.xml; mv `basename gpsctl.1` gpsctl.1 | ||
| 9 | | xmlto: /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate (status 3) | ||
| 10 | | xmlto: Fix document syntax or use --skip-validation option | ||
| 11 | | I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd | ||
| 12 | | /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml:8: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" | ||
| 13 | | "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> | ||
| 14 | | ^ | ||
| 15 | | I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd | ||
| 16 | | warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" | ||
| 17 | | validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" | ||
| 18 | | Document /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate | ||
| 19 | | mv: cannot stat `gpsctl.1': No such file or directory | ||
| 20 | | scons: *** [gpsctl.1] Error 1 | ||
| 21 | | scons: building terminated because of errors. | ||
| 22 | |||
| 23 | Upstream-Status: Inappropriate [disable feature] | ||
| 24 | |||
| 25 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 26 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> | ||
| 27 | --- | ||
| 28 | SConstruct | 4 ++-- | ||
| 29 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 30 | |||
| 31 | diff --git a/SConstruct b/SConstruct | ||
| 32 | index 0e518e7..c01a71b 100644 | ||
| 33 | --- a/SConstruct | ||
| 34 | +++ b/SConstruct | ||
| 35 | @@ -704,12 +704,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); | ||
| 36 | |||
| 37 | manbuilder = mangenerator = htmlbuilder = None | ||
| 38 | if env['manbuild']: | ||
| 39 | - if config.CheckXsltproc(): | ||
| 40 | + if False and config.CheckXsltproc(): | ||
| 41 | mangenerator = 'xsltproc' | ||
| 42 | build = "xsltproc --nonet %s $SOURCE >$TARGET" | ||
| 43 | htmlbuilder = build % docbook_html_uri | ||
| 44 | manbuilder = build % docbook_man_uri | ||
| 45 | - elif WhereIs("xmlto"): | ||
| 46 | + elif False and WhereIs("xmlto"): | ||
| 47 | mangenerator = 'xmlto' | ||
| 48 | xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` `dirname $TARGET`" | ||
| 49 | htmlbuilder = xmlto % "html-nochunks" | ||
| 50 | -- | ||
| 51 | 1.8.5.5 | ||
| 52 | |||
