rpm/coreutils
SHA256
1
0
Fork 0
forked from pool/coreutils
Code Pull Requests Activity

- coreutils-maint-fix-dependency-of-man-arch.1.patch: Add Upstream

Browse Source 
patch to fix the build dependency between src/arch -> man/arch.1
  which lead to spurious build failures.
- coreutils-df-hash-in-filter.patch: Refresh with -p0.

OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=275
This commit is contained in:
Bernhard Voelker 2016-07-28 17:11:07 +00:00 committed by Git OBS Bridge
parent 4488160d56
commit 7790f3a24f
6 changed files with 101 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
coreutils-df-hash-in-filter.patch
View File

@ -12,10 +12,10 @@ Patch was done by Josef Cejka <jcejka@suse.com>.
src/df.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 62 insertions(+), 18 deletions(-)
Index: coreutils-8.25/src/df.c
Index: src/df.c
===================================================================
--- coreutils-8.25.orig/src/df.c 2016-07-22 10:31:00.838791851 +0200
+++ coreutils-8.25/src/df.c 2016-07-22 10:33:37.285989052 +0200
--- src/df.c.orig
+++ src/df.c
@@ -34,6 +34,7 @@
#include "mountlist.h"
#include "quote.h"

70
coreutils-maint-fix-dependency-of-man-arch.1.patch Normal file
View File

@ -0,0 +1,70 @@
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)

8
coreutils-testsuite.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jul 28 17:02:53 UTC 2016 - mail@bernhard-voelker.de
- coreutils-maint-fix-dependency-of-man-arch.1.patch: Add Upstream
patch to fix the build dependency between src/arch -> man/arch.1
which lead to spurious build failures.
- coreutils-df-hash-in-filter.patch: Refresh with -p0.
-------------------------------------------------------------------
Fri Jul 22 10:48:50 CEST 2016 - pth@suse.de

7
coreutils-testsuite.spec
View File

@ -135,6 +135,10 @@ Patch501: coreutils-test_without_valgrind.patch
# to be removed with coreutils > v8.25.
Patch700: coreutils-diagnose-fts-readdir-failure.patch
# Upstream patch to fix the build dependency between src/arch -> man/arch.1;
# to be removed with coreutils > v8.25.
Patch710: coreutils-maint-fix-dependency-of-man-arch.1.patch
# ================================================
%description
These are the GNU core utilities. This package is the union of
@ -178,7 +182,8 @@ the GNU fileutils, sh-utils, and textutils packages.
%patch501
%patch700
%patch114 -p1
%patch114
%patch710
#???## We need to statically link to gmp, otherwise we have a build loop
#???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in

8
coreutils.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jul 28 17:02:53 UTC 2016 - mail@bernhard-voelker.de
- coreutils-maint-fix-dependency-of-man-arch.1.patch: Add Upstream
patch to fix the build dependency between src/arch -> man/arch.1
which lead to spurious build failures.
- coreutils-df-hash-in-filter.patch: Refresh with -p0.
-------------------------------------------------------------------
Fri Jul 22 10:48:50 CEST 2016 - pth@suse.de

7
coreutils.spec
View File

@ -135,6 +135,10 @@ Patch501: coreutils-test_without_valgrind.patch
# to be removed with coreutils > v8.25.
Patch700: coreutils-diagnose-fts-readdir-failure.patch
# Upstream patch to fix the build dependency between src/arch -> man/arch.1;
# to be removed with coreutils > v8.25.
Patch710: coreutils-maint-fix-dependency-of-man-arch.1.patch
# ================================================
%description
These are the GNU core utilities. This package is the union of
@ -178,7 +182,8 @@ the GNU fileutils, sh-utils, and textutils packages.
%patch501
%patch700
%patch114 -p1
%patch114
%patch710
#???## We need to statically link to gmp, otherwise we have a build loop
#???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in