summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBill Randle <william.c.randle@intel.com>2016-03-30 16:50:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-31 23:01:37 +0100
commit9e588481f866acb7ba09fb8a21fe32df42633af2 (patch)
tree15c7853962677c024e749a0b182b37fd9985e01c /meta
parentaa13b972860c82d32a6e44903c07e35afea27d1e (diff)
downloadpoky-9e588481f866acb7ba09fb8a21fe32df42633af2.tar.gz
man: fix several annoying compile/build warnings
Fixed the build error when building man.config.5 (a remnant of a long ago previous patch). Optimized the manpages Makefile for parallel builds. Drop a FHS patch that is no longer needed, as the standard Makefile puts the man pages in the proper location. Also, fix compile warnings in a couple other files. [YOCTO #9341] (From OE-Core rev: 8b4dedebdbddaf352fd84503eee3dd545bbcea41) Signed-off-by: Bill Randle <william.c.randle@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch31
-rw-r--r--meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch105
-rw-r--r--meta/recipes-extended/man/man_1.6g.bb2
3 files changed, 106 insertions, 32 deletions
diff --git a/meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch b/meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch
deleted file mode 100644
index fe66d7599a..0000000000
--- a/meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- man/Makefile.in 2008-12-21 19:19:33.000000000 +0100
6+++ man/Makefile.in.oden 2008-12-21 19:19:39.000000000 +0100
7@@ -34,6 +34,15 @@
8 for i in $(MAN8); \
9 do if test -f $$i.8; then $(INSTALL) $$i.8 $(mandir)/man8/$$i.@man8ext@; fi; done
10
11+install-l10n: $(ALL)
12+ mkdir -p $(mandir)/$(SLANG)/man1 $(mandir)/$(SLANG)/man5 $(mandir)/$(SLANG)/man8
13+ for i in $(MAN1); \
14+ do $(INSTALL) $$i.1 $(mandir)/$(SLANG)/man1/$$i.@man1ext@; done
15+ for i in $(MAN5); \
16+ do $(INSTALL) $$i.5 $(mandir)/$(SLANG)/man5/$$i.@man5ext@; done
17+ for i in $(MAN8); \
18+ do if test -f $$i.8; then $(INSTALL) $$i.8 $(mandir)/$(SLANG)/man8/$$i.@man8ext@; fi; done
19+
20 clean:
21 rm -f core *.in *.@man1ext@ *.@man5ext@ *.@man8ext@ *~
22
23@@ -49,7 +58,7 @@
24 @for i in @languages@; do if test -d $$i; then echo; \
25 echo "==== Installing the `cat $$i.txt` man pages. ===="; \
26 cd $$i; SLANG=/$$i; if test $$SLANG = /en; then SLANG= ; fi; \
27- export SLANG; make -f ../Makefile install; cd ..; \
28+ export SLANG; make -f ../Makefile install-l10n; cd ..; \
29 else echo "==== No $$i man pages found. ===="; fi; done
30
31 cleansubdirs:
diff --git a/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch b/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
new file mode 100644
index 0000000000..4631d2d063
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
@@ -0,0 +1,105 @@
1Fix a build error when building man.config.5 (a remnant of a long
2ago previous patch). Optimized the manpages Makefile for parallel
3builds. Also, fix compile warnings in a couple other files.
4
5Upstream-Status: Pending
6
7Signed-off-by: Bill Randle <william.c.randle@intel.com>
8
9--- man-1.6g/man/Makefile.in.orig 2016-03-28 17:31:08.723949180 -0700
10+++ man-1.6g/man/Makefile.in 2016-03-28 17:46:12.866910386 -0700
11@@ -5,6 +5,13 @@
12 ALL = man.1 whatis.1 apropos.1 man.config.5
13 MAYBE8 = makewhatis
14
15+SUBDIRS := $(shell echo @languages@)
16+
17+.PHONY: subdirs $(SUBDIRS)
18+
19+man.config.man: man.conf.man
20+ @cp $< $@
21+
22 .SUFFIXES: .man .1 .5 .8
23
24 .man.1:
25@@ -19,11 +26,11 @@
26 INSTALL = @INSTALL@ -c -m 644
27
28 # Where to put the manual pages.
29-mandir = $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
30+mandir := $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
31
32 all: $(ALL)
33 for i in $(MAYBE8); \
34- do if test -f $$i.man; then make -f ../Makefile $$i.8; fi; done
35+ do if test -f $$i.man; then $(MAKE) -f ../Makefile $$i.8; fi; done
36
37 install: $(ALL)
38 mkdir -p $(mandir)/man1 $(mandir)/man5 $(mandir)/man8
39@@ -38,24 +45,27 @@
40 rm -f core *.in *.@man1ext@ *.@man5ext@ *.@man8ext@ *~
41
42 spotless:
43+ rm -f man.config.man
44
45 subdirs:
46- @for i in @languages@; do if test -d $$i; then echo; \
47- echo "==== Making the `cat $$i.txt` man pages. ===="; \
48- cd $$i; make -f ../Makefile; cd ..; \
49- else echo "==== No $$i man pages found. ===="; fi; done
50+subdirs: $(SUBDIRS)
51+$(SUBDIRS):
52+ if test -d $@; then echo; \
53+ echo "==== Making the `cat $@.txt` man pages. ===="; \
54+ $(MAKE) -C $@ -f ../Makefile all; \
55+ else echo "==== No $@ man pages found. ===="; fi
56
57 installsubdirs:
58 @for i in @languages@; do if test -d $$i; then echo; \
59 echo "==== Installing the `cat $$i.txt` man pages. ===="; \
60 cd $$i; SLANG=/$$i; if test $$SLANG = /en; then SLANG= ; fi; \
61- export SLANG; make -f ../Makefile install; cd ..; \
62+ export SLANG; $(MAKE) -f ../Makefile install; cd ..; \
63 else echo "==== No $$i man pages found. ===="; fi; done
64
65 cleansubdirs:
66- @for i in ??; do cd $$i; make -f ../Makefile clean; cd ..; done
67+ @for i in ??; do $(MAKE) -C $$i -f ../Makefile clean; done
68 rm -f core *~
69
70 spotlesssubdirs:
71- for i in ??; do cd $$i; make -f ../Makefile spotless; cd ..; done
72+ for i in ??; do $(MAKE) -C $$i -f ../Makefile spotless; done
73 rm -f Makefile
74
75--- man-1.6g/src/gripes.c.orig 2006-11-21 11:53:44.000000000 -0800
76+++ man-1.6g/src/gripes.c 2016-03-30 16:32:31.601103487 -0700
77@@ -7,8 +7,6 @@
78
79 extern char *msg[];
80
81-static char *mantexts = "man"; /* e.g. /usr/lib/locale/%L/man.cat */
82-
83 #ifdef NONLS
84
85 static char *
86@@ -30,6 +28,8 @@
87 #include <nl_types.h>
88 #include "../catopen/catopen.c"
89
90+static char *mantexts = "man"; /* e.g. /usr/lib/locale/%L/man.cat */
91+
92 nl_catd catfd = (nl_catd) -1;
93 int cat_is_open = 0;
94
95--- man-1.6g/src/manfile.c.orig 2005-08-20 16:26:06.000000000 -0700
96+++ man-1.6g/src/manfile.c 2016-03-29 09:10:21.527841285 -0700
97@@ -299,7 +299,7 @@
98 const char *((*tocat)(const char *man_filename, const char *ext,
99 int flags))) {
100 char **sl;
101- struct manpage *res;
102+ struct manpage *res = 0;
103
104 standards = (flags & (FHS | FSSTND | DO_HP | DO_IRIX));
105 to_cat_filename = tocat;
diff --git a/meta/recipes-extended/man/man_1.6g.bb b/meta/recipes-extended/man/man_1.6g.bb
index 9b057b6573..efdf56569a 100644
--- a/meta/recipes-extended/man/man_1.6g.bb
+++ b/meta/recipes-extended/man/man_1.6g.bb
@@ -39,7 +39,6 @@ SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}.tar.gz/ba
39 file://man-1.5i2-initial.patch \ 39 file://man-1.5i2-initial.patch \
40 file://man-1.5h1-gencat.patch;striplevel=0 \ 40 file://man-1.5h1-gencat.patch;striplevel=0 \
41 file://man-1.5g-nonrootbuild.patch \ 41 file://man-1.5g-nonrootbuild.patch \
42 file://man-1.5m2-tv_fhs.patch;striplevel=0 \
43 file://man-1.5j-i18n.patch \ 42 file://man-1.5j-i18n.patch \
44 file://man-1.6e-whatis2.patch \ 43 file://man-1.6e-whatis2.patch \
45 file://man-1.6e-use_i18n_vars_in_a_std_way.patch \ 44 file://man-1.6e-use_i18n_vars_in_a_std_way.patch \
@@ -54,6 +53,7 @@ SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}.tar.gz/ba
54 file://man-1.6g-whatis3.patch \ 53 file://man-1.6g-whatis3.patch \
55 file://configure_sed.patch \ 54 file://configure_sed.patch \
56 file://man-1.6g-parallel.patch \ 55 file://man-1.6g-parallel.patch \
56 file://man-1.6g-compile-warnings.patch \
57" 57"
58 58
59SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660" 59SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660"