Archives
Archives
| From: | "Pacho Ramos (pacho)" <pacho@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in sys-apps/preload/files: preload-0.6.4-use-help2man-as-usual.patch preload-0.6.4-use-make-dependencies.patch |
| Date: | Mon, 06 Sep 2010 15:36:14 |
| Message-Id: | 20100906153610.D702720054@flycatcher.gentoo.org |
| 1 | pacho 10/09/06 15:36:10 |
| 2 | |
| 3 | Added: preload-0.6.4-use-help2man-as-usual.patch |
| 4 | preload-0.6.4-use-make-dependencies.patch |
| 5 | Log: |
| 6 | Apply Flameeyes' patches to fix parallel compilation (bug #244966 by Jeremy Olexa). Also use 'elog' instead of 'einfo' and drop old 'eerror' message. Move to EAPI 2. |
| 7 | (Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: preload-0.6.4-use-help2man-as-usual.patch |
| 16 | =================================================================== |
| 17 | --- src/Makefile.am~ 2009-04-15 23:46:04.000000000 +0200 |
| 18 | +++ src/Makefile.am 2010-04-09 12:56:45.000000000 +0200 |
| 19 | @@ -54,23 +54,11 @@ |
| 20 | |
| 21 | dist_man_MANS = preload.8 |
| 22 | |
| 23 | -$(srcdir)/preload.8: cmdline.c ../configure.ac preload.8.i |
| 24 | - $(MAKE) $(AM_MAKEFLAGS) preload |
| 25 | - @echo "Creating $@ using help2man(1)" |
| 26 | - @$(top_builddir)/missing --run \ |
| 27 | - help2man --no-info --section=8 --include=preload.8.i \ |
| 28 | - --help-option="-H" --output="$@.tmp" \ |
| 29 | - --name 'Adaptive readahead daemon' ./preload \ |
| 30 | - && mv "$@.tmp" "$@" \ |
| 31 | - || ($(RM) "$@"; \ |
| 32 | - echo Failed to update preload.8, the man page may be outdated >&2; \ |
| 33 | - (test -f "$@" || echo help2man is required to generate this file. >> "$@")); |
| 34 | - |
| 35 | -install-data-hook: |
| 36 | - @cd "$(DESTDIR)$(man8dir)" && gzip -c preload.8 > preload.8.gz.tmp && mv preload.8.gz.tmp preload.8.gz && $(RM) preload.8 |
| 37 | - |
| 38 | -uninstall-hook: |
| 39 | - $(RM) "$(DESTDIR)$(man8dir)/preload.8.gz" |
| 40 | +preload.8: preload preload.8.i |
| 41 | + -$(HELP2MAN) \ |
| 42 | + --no-info --section=8 --include=preload.8.i \ |
| 43 | + --help-option="-H" --output="$@" \ |
| 44 | + --name 'Adaptive readahead daemon' ./$^ |
| 45 | |
| 46 | ###################################################################### |
| 47 | |
| 48 | |
| 49 | |
| 50 | |
| 51 | 1.1 sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch |
| 52 | |
| 53 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch?rev=1.1&view=markup |
| 54 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch?rev=1.1&content-type=text/plain |
| 55 | |
| 56 | Index: preload-0.6.4-use-make-dependencies.patch |
| 57 | =================================================================== |
| 58 | --- src/Makefile.am~ 2010-04-09 12:56:45.000000000 +0200 |
| 59 | +++ src/Makefile.am 2010-04-09 12:58:36.000000000 +0200 |
| 60 | @@ -8,8 +8,6 @@ |
| 61 | -DLOGDIR='"${logdir}"' \ |
| 62 | -DPKGLOCALSTATEDIR='"${pkglocalstatedir}"' |
| 63 | |
| 64 | -preload.o cmdline.o preload.8: Makefile |
| 65 | - |
| 66 | sbin_PROGRAMS = preload |
| 67 | |
| 68 | preload_SOURCES = \ |
| 69 | @@ -64,8 +62,7 @@ |
| 70 | |
| 71 | MAINTAINERCLEANFILES += preload.conf.debug |
| 72 | |
| 73 | -preload.conf.debug: |
| 74 | - $(MAKE) $(AM_MAKEFLAGS) preload.conf |
| 75 | +preload.conf.debug: preload.conf |
| 76 | cp preload.conf preload.conf.debug |
| 77 | |
| 78 | RUNPREQ = preload preload.conf.debug |