summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/coreutils/coreutils-6.9/fix_for_manpage_building.patch83
-rw-r--r--meta/recipes-core/coreutils/coreutils_6.9.bb10
2 files changed, 90 insertions, 3 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-6.9/fix_for_manpage_building.patch b/meta/recipes-core/coreutils/coreutils-6.9/fix_for_manpage_building.patch
new file mode 100644
index 0000000000..67e12795da
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils-6.9/fix_for_manpage_building.patch
@@ -0,0 +1,83 @@
1Use native coreutils binaries to build manpages in cross environment.
2This avoids man page build issues like this:
3
4| Making all in man
5| make[1]: Entering directory `/build_disk/poky_build/build1/tmp/work/i586-poky-linux/coreutils-6.9-r0/coreutils-6.9/man'
6| Updating man page cut.1
7| Updating man page dir.1
8| Updating man page expand.1
9| Updating man page fold.1
10| Updating man page install.1
11| Updating man page join.1
12| Updating man page pr.1
13| Updating man page ls.1
14| Updating man page sort.1
15| Updating man page unexpand.1
16| Updating man page uniq.1
17| Updating man page who.1
18| Updating man page vdir.1
19| help2man: can't get `--help' info from dir.td/dir
20| help2man: can't get `--help' info from cut.td/cut
21| make[1]: *** [dir.1] Error 126
22| make[1]: *** Waiting for unfinished jobs....
23| help2man: can't get `--help' info from fold.td/fold
24| help2man: can't get `--help' info from install.td/install
25| help2man: can't get `--help' info from expand.td/expand
26| help2man: can't get `--help' info from join.td/join
27| make[1]: *** [cut.1] Error 126
28| make[1]: *** [fold.1] Error 126
29| make[1]: *** [install.1] Error 126
30| help2man: can't get `--help' info from sort.td/sort
31| make[1]: *** [expand.1] Error 126
32| help2man: can't get `--help' info from pr.td/pr
33| make[1]: *** [join.1] Error 126
34| help2man: can't get `--help' info from ls.td/ls
35| help2man: can't get `--help' info from unexpand.td/unexpand
36| help2man: can't get `--help' info from uniq.td/uniq
37| help2man: can't get `--help' info from who.td/who
38| make[1]: *** [sort.1] Error 126
39| make[1]: *** [pr.1] Error 126
40| help2man: can't get `--help' info from vdir.td/vdir
41| make[1]: *** [ls.1] Error 126
42| make[1]: *** [uniq.1] Error 126
43| make[1]: *** [unexpand.1] Error 126
44| make[1]: *** [who.1] Error 126
45| make[1]: *** [vdir.1] Error 126
46| make[1]: Leaving directory `/build_disk/poky_build/build1/tmp/work/i586-poky-linux/coreutils-6.9-r0/coreutils-6.9/man'
47| make: *** [all-recursive] Error 1
48| FATAL: oe_runmake failed
49| ERROR: Function 'do_compile' failed (see /build_disk/poky_build/build1/tmp/work/i586-poky-linux/coreutils-6.9-r0/temp/log.do_compile.12780 for further information)
50NOTE: package coreutils-6.9-r0: task do_compile: Failed
51ERROR: Task 8 (/home/nitin/prj/poky.git/meta/recipes-core/coreutils/coreutils_6.9.bb, do_compile) failed with exit code '1'
52
53
54This patch is made for gplv2 coreutils the recipe
55Nitin A Kamble <nitin.a.kamble@intel.com>
562011/03/17
57
58Index: man/Makefile.am
59===================================================================
60--- a/man.orig/Makefile.am
61+++ b/man/Makefile.am
62@@ -167,7 +167,7 @@ mapped_name = `echo $*|sed 's/install/gi
63 $(PERL) -- $(srcdir)/help2man \
64 --source='$(PACKAGE_STRING)' \
65 --include=$(srcdir)/$*.x \
66- --output=$t/$@ $t/$*; \
67+ --output=$t/$@ $*; \
68 } \
69 && sed 's|$*\.td/||g' $t/$@ > $@ \
70 && chmod a-w $@ \
71Index: man/Makefile.in
72===================================================================
73--- a/man.orig/Makefile.in
74+++ b/man/Makefile.in
75@@ -865,7 +865,7 @@ yes.1: $(common_dep) $(srcdir)/yes.x .
76 $(PERL) -- $(srcdir)/help2man \
77 --source='$(PACKAGE_STRING)' \
78 --include=$(srcdir)/$*.x \
79- --output=$t/$@ $t/$*; \
80+ --output=$t/$@ $*; \
81 } \
82 && sed 's|$*\.td/||g' $t/$@ > $@ \
83 && chmod a-w $@ \
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index 60ea903432..2d7fdedea8 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -8,12 +8,13 @@ BUGTRACKER = "http://debbugs.gnu.org/coreutils"
8LICENSE = "GPLv2+" 8LICENSE = "GPLv2+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 9LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
10 file://src/ls.c;startline=4;endline=16;md5=482a96d4f25010a4e13f8743e0c3685e" 10 file://src/ls.c;startline=4;endline=16;md5=482a96d4f25010a4e13f8743e0c3685e"
11PR = "r0" 11PR = "r1"
12DEPENDS = "perl-native" 12DEPENDS = "perl-native coreutils-native-${PV} gettext "
13DEPENDS_virtclass-native = "perl-native gettext-native"
13 14
14inherit autotools gettext 15inherit autotools gettext
15 16
16SRC_URI = "http://ftp.gnu.org/gnu/coreutils/${BP}.tar.bz2 \ 17SRC_URI_BASE = "http://ftp.gnu.org/gnu/coreutils/${BP}.tar.bz2 \
17 file://gnulib_m4.patch \ 18 file://gnulib_m4.patch \
18 file://futimens.patch \ 19 file://futimens.patch \
19 file://coreutils-ls-x.patch \ 20 file://coreutils-ls-x.patch \
@@ -23,6 +24,9 @@ SRC_URI = "http://ftp.gnu.org/gnu/coreutils/${BP}.tar.bz2 \
23 file://coreutils-fix-install.patch \ 24 file://coreutils-fix-install.patch \
24 file://man-touch.patch" 25 file://man-touch.patch"
25 26
27SRC_URI = "${SRC_URI_BASE} file://fix_for_manpage_building.patch"
28SRC_URI_virtclass-native = "${SRC_URI_BASE}"
29
26# [ gets a special treatment and is not included in this 30# [ gets a special treatment and is not included in this
27bindir_progs = "base64 basename cksum comm csplit cut dir dircolors dirname du \ 31bindir_progs = "base64 basename cksum comm csplit cut dir dircolors dirname du \
28 env expand expr factor fmt fold groups head hostid id install \ 32 env expand expr factor fmt fold groups head hostid id install \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 08:47:51 +0000