forked from pool/coreutils
71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
|
Upstream patch to fix the build dependency between src/arch -> man/arch.1;
|
||
|
|
to be removed with coreutils > v8.25.
|
||
|
|
|
||
|
|
Downstream addition:
|
||
|
|
* Propagate the change from local.mk to Makefile.in, which is done
|
||
|
|
upstreams by autoconf.
|
||
|
|
|
||
|
|
Original patch:
|
||
|
|
http://git.sv.gnu.org/cgit/coreutils.git/commit/?id=a69e54cfdf7e
|
||
|
|
|
||
|
|
From a69e54cfdf7e5d8c2c3fe315ded649272d7e8711 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bernhard Voelker <mail@bernhard-voelker.de>
|
||
|
|
Date: Tue, 26 Jul 2016 20:58:08 +0200
|
||
|
|
Subject: [PATCH] maint: fix dependency of man/arch.1
|
||
|
|
|
||
|
|
The following is a reproducer for the wrong dependency:
|
||
|
|
|
||
|
|
$ ./configure --enable-install-program=arch
|
||
|
|
$ make
|
||
|
|
$ rm -f src/arch man/arch.1
|
||
|
|
$ make man/arch.1
|
||
|
|
GEN man/arch.1
|
||
|
|
help2man: can't get `--help' info from man/arch.td/arch
|
||
|
|
Try `--no-discard-stderr' if option outputs to stderr
|
||
|
|
Makefile:14378: recipe for target 'man/arch.1' failed
|
||
|
|
make: *** [man/arch.1] Error 127
|
||
|
|
|
||
|
|
* man/local.mk (man/arch.1): Change to depend on src/arch rather than
|
||
|
|
src/uname: while the arch binary depends on uname.c and uname-arch.c,
|
||
|
|
its man page depends on the arch binary.
|
||
|
|
|
||
|
|
Reported downstream by Rodrigues Goldwyn <rgoldwyn@suse.com> in
|
||
|
|
https://build.opensuse.org/request/show/415172
|
||
|
|
---
|
||
|
|
Makefile.in | 2 +-
|
||
|
|
man/local.mk | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
Index: man/local.mk
|
||
|
|
===================================================================
|
||
|
|
--- man/local.mk.orig
|
||
|
|
+++ man/local.mk
|
||
|
|
@@ -56,10 +56,10 @@ if SINGLE_BINARY
|
||
|
|
mandeps += src/coreutils$(EXEEXT)
|
||
|
|
else
|
||
|
|
# Most prog.1 man pages depend on src/prog. List the exceptions:
|
||
|
|
-man/arch.1: src/uname$(EXEEXT)
|
||
|
|
man/install.1: src/ginstall$(EXEEXT)
|
||
|
|
man/test.1: src/[$(EXEEXT)
|
||
|
|
|
||
|
|
+man/arch.1: src/arch$(EXEEXT)
|
||
|
|
man/base32.1: src/base32$(EXEEXT)
|
||
|
|
man/base64.1: src/base64$(EXEEXT)
|
||
|
|
man/basename.1: src/basename$(EXEEXT)
|
||
|
|
Index: Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- Makefile.in.orig
|
||
|
|
+++ Makefile.in
|
||
|
|
@@ -14276,10 +14276,10 @@ distclean-local:
|
||
|
|
|
||
|
|
$(ALL_MANS): $(mandeps)
|
||
|
|
# Most prog.1 man pages depend on src/prog. List the exceptions:
|
||
|
|
-@SINGLE_BINARY_FALSE@man/arch.1: src/uname$(EXEEXT)
|
||
|
|
@SINGLE_BINARY_FALSE@man/install.1: src/ginstall$(EXEEXT)
|
||
|
|
@SINGLE_BINARY_FALSE@man/test.1: src/[$(EXEEXT)
|
||
|
|
|
||
|
|
+@SINGLE_BINARY_FALSE@man/arch.1: src/arch$(EXEEXT)
|
||
|
|
@SINGLE_BINARY_FALSE@man/base32.1: src/base32$(EXEEXT)
|
||
|
|
@SINGLE_BINARY_FALSE@man/base64.1: src/base64$(EXEEXT)
|
||
|
|
@SINGLE_BINARY_FALSE@man/basename.1: src/basename$(EXEEXT)
|