diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-02-17 00:47:45 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-17 22:35:02 +0000 |
commit | 2fdc77221a2e743c264f10799b8eeff5ab483df0 (patch) | |
tree | f80b5c52be6bb7323e8299f2832cfad4b819a641 /meta | |
parent | a48168602e332090b49802531339b4f8104fb3ac (diff) | |
download | poky-2fdc77221a2e743c264f10799b8eeff5ab483df0.tar.gz |
coreutils: import prebuilt manpages from Gentoo
As can be seen here:
http://lists.gnu.org/archive/html/coreutils/2014-11/msg00001.html
other people have run into the headache of trying to cross compile
coreutils, with the "help2man" problem (assumes host can run the
target binaries with "--help" arg to collect data for manpage.)
And since "current wisdom is this is working as intended" we are
largely left with no choice but to use the same solution and
abandon trying to generate the man pages at build time. So here
we import prebuilt manpages.
(From OE-Core rev: 1c0bdebbe362dc47b3b6f521ba15ccf0de15e5b5)
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.23.bb | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/meta/recipes-core/coreutils/coreutils_8.23.bb b/meta/recipes-core/coreutils/coreutils_8.23.bb index be68a31031..63df75e7ba 100644 --- a/meta/recipes-core/coreutils/coreutils_8.23.bb +++ b/meta/recipes-core/coreutils/coreutils_8.23.bb | |||
@@ -12,14 +12,17 @@ DEPENDS_class-native = "" | |||
12 | 12 | ||
13 | inherit autotools gettext texinfo | 13 | inherit autotools gettext texinfo |
14 | 14 | ||
15 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ | 15 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz;name=tarball \ |
16 | http://distfiles.gentoo.org/distfiles/${BP}-man.tar.xz;name=manpages \ | ||
16 | file://man-decouple-manpages-from-build.patch \ | 17 | file://man-decouple-manpages-from-build.patch \ |
17 | file://remove-usr-local-lib-from-m4.patch \ | 18 | file://remove-usr-local-lib-from-m4.patch \ |
18 | file://fix-selinux-flask.patch \ | 19 | file://fix-selinux-flask.patch \ |
19 | " | 20 | " |
20 | 21 | ||
21 | SRC_URI[md5sum] = "abed135279f87ad6762ce57ff6d89c41" | 22 | SRC_URI[tarball.md5sum] = "abed135279f87ad6762ce57ff6d89c41" |
22 | SRC_URI[sha256sum] = "ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d" | 23 | SRC_URI[tarball.sha256sum] = "ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d" |
24 | SRC_URI[manpages.md5sum] = "ce49bc8360e16afe67581d136606efc7" | ||
25 | SRC_URI[manpages.sha256sum] = "d1b16e74b3dba4f313aeebae2c69da205f7d2e6e1c2aa8d39026c860d314ecca" | ||
23 | 26 | ||
24 | EXTRA_OECONF_class-native = "--without-gmp" | 27 | EXTRA_OECONF_class-native = "--without-gmp" |
25 | EXTRA_OECONF_class-target = "--enable-install-program=arch --libexecdir=${libdir}" | 28 | EXTRA_OECONF_class-target = "--enable-install-program=arch --libexecdir=${libdir}" |
@@ -71,6 +74,13 @@ do_install_append() { | |||
71 | # in update-alternatives to fail, therefore use lbracket - the name used | 74 | # in update-alternatives to fail, therefore use lbracket - the name used |
72 | # for the actual source file. | 75 | # for the actual source file. |
73 | mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN} | 76 | mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN} |
77 | |||
78 | # prebuilt man pages | ||
79 | install -d ${D}/${mandir}/man1 | ||
80 | install -t ${D}/${mandir}/man1 ${S}/man/*.1 | ||
81 | # prebuilt man pages don't do a separate man page for [ vs test. | ||
82 | # see comment above r.e. sed and update-alternatives | ||
83 | cp -a ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN} | ||
74 | } | 84 | } |
75 | 85 | ||
76 | do_install_append_class-native(){ | 86 | do_install_append_class-native(){ |
@@ -82,18 +92,23 @@ inherit update-alternatives | |||
82 | 92 | ||
83 | ALTERNATIVE_PRIORITY = "100" | 93 | ALTERNATIVE_PRIORITY = "100" |
84 | ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df" | 94 | ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df" |
95 | ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1" | ||
85 | 96 | ||
86 | ALTERNATIVE_LINK_NAME[base64] = "${base_bindir}/base64" | 97 | ALTERNATIVE_LINK_NAME[base64] = "${base_bindir}/base64" |
87 | ALTERNATIVE_TARGET[base64] = "${bindir}/base64.${BPN}" | 98 | ALTERNATIVE_TARGET[base64] = "${bindir}/base64.${BPN}" |
99 | ALTERNATIVE_LINK_NAME[base64.1] = "${mandir}/man1/base64.1" | ||
88 | 100 | ||
89 | ALTERNATIVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp" | 101 | ALTERNATIVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp" |
90 | ALTERNATIVE_TARGET[mktemp] = "${bindir}/mktemp.${BPN}" | 102 | ALTERNATIVE_TARGET[mktemp] = "${bindir}/mktemp.${BPN}" |
103 | ALTERNATIVE_LINK_NAME[mktemp.1] = "${mandir}/man1/mktemp.1" | ||
91 | 104 | ||
92 | ALTERNATIVE_LINK_NAME[df] = "${base_bindir}/df" | 105 | ALTERNATIVE_LINK_NAME[df] = "${base_bindir}/df" |
93 | ALTERNATIVE_TARGET[df] = "${bindir}/df.${BPN}" | 106 | ALTERNATIVE_TARGET[df] = "${bindir}/df.${BPN}" |
107 | ALTERNATIVE_LINK_NAME[df.1] = "${mandir}/man1/df.1" | ||
94 | 108 | ||
95 | ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/[" | 109 | ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/[" |
96 | ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}" | 110 | ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}" |
111 | ALTERNATIVE_LINK_NAME[lbracket.1] = "${mandir}/man1/lbracket.1" | ||
97 | 112 | ||
98 | python __anonymous() { | 113 | python __anonymous() { |
99 | for prog in d.getVar('base_bindir_progs', True).split(): | 114 | for prog in d.getVar('base_bindir_progs', True).split(): |