summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-navigation
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-07-15 23:51:50 +0300
committerKhem Raj <raj.khem@gmail.com>2019-07-15 18:50:07 -0700
commit4efcd85f287fe389d61c617411e5f35b9cb901d7 (patch)
tree688b109e6e1acce8d854f8b046d77a983baf0cb8 /meta-oe/recipes-navigation
parent700e1ae17379b56d1289b060ec1e61c2184ab9dc (diff)
downloadmeta-openembedded-4efcd85f287fe389d61c617411e5f35b9cb901d7.tar.gz
gpsd: Disable manpage building by config option instead of patching
Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0003-SConstruct-disable-html-and-man-docs-building-becaus.patch51
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb2
2 files changed, 1 insertions, 52 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0003-SConstruct-disable-html-and-man-docs-building-becaus.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0003-SConstruct-disable-html-and-man-docs-building-becaus.patch
deleted file mode 100644
index ba3d205d1..000000000
--- a/meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0003-SConstruct-disable-html-and-man-docs-building-becaus.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 697e2e9ff97487266d817cdd41bacc83f681e3d7 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 29 Apr 2012 00:05:59 +0200
4Subject: [PATCH 4/4] SConstruct: disable html and man docs building because
5 xmlto-native from OE is broken
6
7It 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
23Upstream-Status: Inappropriate [disable feature]
24
25Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
26Signed-off-by: Peter A. Bigot <pab@pabigot.com>
27---
28 SConstruct | 4 ++--
29 1 file changed, 2 insertions(+), 2 deletions(-)
30
31diff --git a/SConstruct b/SConstruct
32index 3318bb48..a5bb756d 100644
33--- a/SConstruct
34+++ b/SConstruct
35@@ -889,11 +889,11 @@ else:
36
37 manbuilder = htmlbuilder = None
38 if env['manbuild']:
39- if config.CheckXsltproc():
40+ if False and config.CheckXsltproc():
41 build = "xsltproc --nonet %s $SOURCE >$TARGET"
42 htmlbuilder = build % docbook_html_uri
43 manbuilder = build % docbook_man_uri
44- elif WhereIs("xmlto"):
45+ elif False and WhereIs("xmlto"):
46 xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` " \
47 "`dirname $TARGET`"
48 htmlbuilder = xmlto % "html-nochunks"
49--
501.8.5.5
51
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb
index ce4b2b860..ebbc7f3b3 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb
@@ -13,7 +13,6 @@ EXTRANATIVEPATH += "chrpath-native"
13 13
14SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ 14SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
15 file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ 15 file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
16 file://0003-SConstruct-disable-html-and-man-docs-building-becaus.patch \
17" 16"
18SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5" 17SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5"
19SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e" 18SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e"
@@ -40,6 +39,7 @@ EXTRA_OESCONS = " \
40 chrpath='yes' \ 39 chrpath='yes' \
41 systemd='${SYSTEMD_OESCONS}' \ 40 systemd='${SYSTEMD_OESCONS}' \
42 libdir='${libdir}' \ 41 libdir='${libdir}' \
42 manbuild='false' \
43 ${PACKAGECONFIG_CONFARGS} \ 43 ${PACKAGECONFIG_CONFARGS} \
44" 44"
45# this cannot be used, because then chrpath is not found and only static lib is built 45# this cannot be used, because then chrpath is not found and only static lib is built