diff options
| -rw-r--r-- | meta/recipes-extended/man/man/man-1.6g-parallel.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-extended/man/man_1.6g.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-extended/man/man/man-1.6g-parallel.patch b/meta/recipes-extended/man/man/man-1.6g-parallel.patch new file mode 100644 index 0000000000..72a88b898a --- /dev/null +++ b/meta/recipes-extended/man/man/man-1.6g-parallel.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | The Makefile for man has a rule to create two generated targets with | ||
| 2 | a program run from the shell. Because the rule was run twice, with | ||
| 3 | parallel make, the generated files were being overwritten at the same | ||
| 4 | time they were being compiled. This patch forces the rule to be run | ||
| 5 | only once. | ||
| 6 | |||
| 7 | Upstream-Status: Pending | ||
| 8 | |||
| 9 | Signed-off-by: Bill Randle <william.c.randle at intel.com> | ||
| 10 | |||
| 11 | --- man-1.6g/src/Makefile.in.orig 2010-12-31 12:28:46.000000000 -0800 | ||
| 12 | +++ man-1.6g/src/Makefile.in 2016-03-28 09:09:16.845458798 -0700 | ||
| 13 | @@ -43,8 +43,10 @@ | ||
| 14 | makemsg: | ||
| 15 | $(BUILD_CC) -o makemsg makemsg.c | ||
| 16 | |||
| 17 | -msg.c gripedefs.h: ../msgs/mess.en makemsg | ||
| 18 | +msg.c gripedefs.h: genfiles-stamp | ||
| 19 | +genfiles-stamp: ../msgs/mess.en makemsg | ||
| 20 | ./makemsg ../msgs/mess.en gripedefs.h msg.c | ||
| 21 | + touch genfiles-stamp | ||
| 22 | |||
| 23 | # glob.c does not have prototypes | ||
| 24 | glob.o: glob.c ndir.h | ||
| 25 | @@ -117,4 +119,4 @@ | ||
| 26 | |||
| 27 | spotless: clean | ||
| 28 | rm -f Makefile config.status paths.h version.h man.conf | ||
| 29 | - rm -f gripedefs.h msg.c mess.*.cat | ||
| 30 | + rm -f gripedefs.h msg.c mess.*.cat genfiles-stamp | ||
diff --git a/meta/recipes-extended/man/man_1.6g.bb b/meta/recipes-extended/man/man_1.6g.bb index fa4736b298..9b057b6573 100644 --- a/meta/recipes-extended/man/man_1.6g.bb +++ b/meta/recipes-extended/man/man_1.6g.bb | |||
| @@ -53,6 +53,7 @@ SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}.tar.gz/ba | |||
| 53 | file://manpath.5.gz;unpack=false \ | 53 | file://manpath.5.gz;unpack=false \ |
| 54 | file://man-1.6g-whatis3.patch \ | 54 | file://man-1.6g-whatis3.patch \ |
| 55 | file://configure_sed.patch \ | 55 | file://configure_sed.patch \ |
| 56 | file://man-1.6g-parallel.patch \ | ||
| 56 | " | 57 | " |
| 57 | 58 | ||
| 58 | SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660" | 59 | SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660" |
