From e4220aef32d666a97a99148040f5851e3ba734572c67087dd3e74de2d9bc2761 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 27 Jun 2020 21:20:19 +0000 Subject: [PATCH] Accepting request 816056 from Base:System OBS-URL: https://build.opensuse.org/request/show/816056 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=134 --- coreutils-gnulib-disable-test-float.patch | 25 +++++++++++++++++++++++ coreutils.changes | 9 ++++++++ coreutils.spec | 24 +++++++++------------- 3 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 coreutils-gnulib-disable-test-float.patch diff --git a/coreutils-gnulib-disable-test-float.patch b/coreutils-gnulib-disable-test-float.patch new file mode 100644 index 0000000..c49e107 --- /dev/null +++ b/coreutils-gnulib-disable-test-float.patch @@ -0,0 +1,25 @@ +Disable gnulib test 'test-float' temporarily as it fails on ppc and ppc64le. + +* gnulib-tests/gnulib.mk: Comment lines related to 'test-float'. +--- + gnulib-tests/gnulib.mk | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +Index: gnulib-tests/gnulib.mk +=================================================================== +--- gnulib-tests/gnulib.mk.orig ++++ gnulib-tests/gnulib.mk +@@ -635,9 +635,10 @@ EXTRA_DIST += test-filevercmp.c macros.h + + ## begin gnulib module float-tests + +-TESTS += test-float +-check_PROGRAMS += test-float +-EXTRA_DIST += test-float.c macros.h ++# Test fails with GCC-10 on ppc and ppc64le. ++#TESTS += test-float ++#check_PROGRAMS += test-float ++#EXTRA_DIST += test-float.c macros.h + + ## end gnulib module float-tests + diff --git a/coreutils.changes b/coreutils.changes index 7e8b818..adb0121 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Jun 13 08:48:03 UTC 2020 - Bernhard Voelker + +- coreutils-gnulib-disable-test-float.patch: Add patch to temporarily + disable the gnulib test 'test-float' failing on ppc and ppc64le. +- coreutils.spec: Reference the patch. While at it, avoid conditional + Patch and Source entries as that break cross-platform builds from + source RPMs. + ------------------------------------------------------------------- Mon May 4 08:05:15 UTC 2020 - Dirk Mueller diff --git a/coreutils.spec b/coreutils.spec index 289628b..d92ac3c 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -86,7 +86,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build #cgit-URL: https://git.savannah.gnu.org/cgit/coreutils.git/ #Git-Clone: git://git.sv.gnu.org/coreutils -%if "%{name}" == "coreutils" # For upgrading the upstream version, increase the version number (above), # then remove the old tarball and signature files and let OSC download # those files of the new version: @@ -97,18 +96,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # Finally, add a changelog entry and commit: # osc vc # osc ci -Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz -Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig -Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=%{name}&download=1&file=./%{name}.keyring -%else -# In "coreutils-testsuite", we use the version controlled file from "coreutils". -# otherwise that file would be downloaded twice during the above mentioned -# upgrade procedure. -Source0: coreutils-%{version}.tar.xz -Source1: coreutils-%{version}.tar.xz.sig -Source2: coreutils.keyring -%endif +Source0: https://ftp.gnu.org/gnu/coreutils/coreutils-%{version}.tar.xz +Source1: https://ftp.gnu.org/gnu/coreutils/coreutils-%{version}.tar.xz.sig +Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=coreutils&download=1&file=./coreutils.keyring Source3: baselibs.conf Patch1: coreutils-remove_hostname_documentation.patch @@ -130,9 +121,7 @@ Patch113: coreutils-misc.patch # a glibc issue in mkstemp. Patch300: coreutils-skip-some-sort-tests-on-ppc.patch -%ifarch %ix86 x86_64 ppc ppc64 Patch301: coreutils-skip-gnulib-test-tls.patch -%endif # tests: shorten extreme-expensive factor tests Patch303: coreutils-tests-shorten-extreme-factor-tests.patch @@ -147,6 +136,8 @@ Patch501: coreutils-test_without_valgrind.patch # Remove this patch with the next coreutils release. Patch800: coreutils-ls-restore-8.31-behavior-on-removed-dirs.patch +Patch820: coreutils-gnulib-disable-test-float.patch + # ================================================ %description These are the GNU core utilities. This package is the union of @@ -202,6 +193,11 @@ This package contains the documentation for the GNU Core Utilities. %patch800 +%ifarch ppc ppc64le +# Disable gnulib test 'test-float' temporarily as it fails on ppc and ppc64le. +%patch820 +%endif + # ================================================ %build %if 0%{suse_version} >= 1200