diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2021-08-01 00:59:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-01 00:59:50 +0200 |
| commit | 3f6e5069a7540e6ba6b65abde8e4d55d5d44fa98 (patch) | |
| tree | 39b2315c247de3c3aefc1613859fad432d75b0fb | |
| parent | 71394c34478e5e53a8839980481e3eaea39254cd (diff) | |
| parent | a7dbb32253ed33b1c8fba5eb0ad10025cbe3f7f8 (diff) | |
| download | nixpkgs-3f6e5069a7540e6ba6b65abde8e4d55d5d44fa98.tar nixpkgs-3f6e5069a7540e6ba6b65abde8e4d55d5d44fa98.tar.gz nixpkgs-3f6e5069a7540e6ba6b65abde8e4d55d5d44fa98.tar.bz2 nixpkgs-3f6e5069a7540e6ba6b65abde8e4d55d5d44fa98.tar.lz nixpkgs-3f6e5069a7540e6ba6b65abde8e4d55d5d44fa98.tar.xz nixpkgs-3f6e5069a7540e6ba6b65abde8e4d55d5d44fa98.tar.zst nixpkgs-3f6e5069a7540e6ba6b65abde8e4d55d5d44fa98.zip | |
Merge pull request #132255 from lopsided98/findutils-arm-patch
findutils: remove upstreamed patch
| -rw-r--r-- | pkgs/tools/misc/findutils/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch | 45 |
2 files changed, 1 insertions, 49 deletions
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 57839f73056..8c8b8c7b2b4 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -20,10 +20,7 @@ stdenv.mkDerivation rec { substituteInPlace xargs/xargs.c --replace 'char default_cmd[] = "echo";' 'char default_cmd[] = "${coreutils}/bin/echo";' ''; - patches = [ ./no-install-statedir.patch ] - # fix gnulib tests on 32-bit ARM. Included on findutils master. - # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html - ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; + patches = [ ./no-install-statedir.patch ]; buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort diff --git a/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch b/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch deleted file mode 100644 index 39bd29f8439..00000000000 --- a/pkgs/tools/misc/findutils/fix-gnulib-tests-arm.patch +++ /dev/null @@ -1,45 +0,0 @@ ->From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Thu, 27 Aug 2020 17:52:58 -0700 -Subject: [PATCH] perror, strerror_r: remove unportable tests - -Problem reported by Florian Weimer in: -https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html -* tests/test-perror2.c (main): -* tests/test-strerror_r.c (main): Omit unportable tests. ---- - tests/test-perror2.c | 3 --- - tests/test-strerror_r.c | 3 --- - 2 files changed, 6 deletions(-) - -diff --git a/gnulib-tests/test-perror2.c b/gnulib-tests/test-perror2.c -index 1d14eda7b..c6214dd25 100644 ---- a/gnulib-tests/test-perror2.c -+++ b/gnulib-tests/test-perror2.c -@@ -79,9 +79,6 @@ main (void) - errno = -5; - perror (""); - ASSERT (!ferror (stderr)); -- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); -- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); -- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); - ASSERT (STREQ (msg4, str4)); - - free (str1); -diff --git a/gnulib-tests/test-strerror_r.c b/gnulib-tests/test-strerror_r.c -index b11d6fd9f..c1dbcf837 100644 ---- a/gnulib-tests/test-strerror_r.c -+++ b/gnulib-tests/test-strerror_r.c -@@ -165,9 +165,6 @@ main (void) - - strerror_r (EACCES, buf, sizeof buf); - strerror_r (-5, buf, sizeof buf); -- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); -- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); -- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); - ASSERT (STREQ (msg4, str4)); - - free (str1); --- -2.17.1 - |