Accepting request 902721 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/902721
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/augeas?expand=0&rev=53

augeas.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun  8 15:00:58 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- add remove-unportable-tests.patch to fix build
+
 -------------------------------------------------------------------
 Wed May 26 23:58:36 UTC 2021 - Jason Sikes <jsikes@suse.com>
 

augeas.spec

@@ -31,6 +31,7 @@ Patch0:         augeas-modprobe-lense.patch
 Patch1:         gcc9-disable-broken-test.patch
 Patch2:         augeas-new_options_for_chrony.patch
 Patch3:         augeas-allow_printable_ASCII.patch
+Patch4:         remove-unportable-tests.patch
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
 BuildRequires:  pkgconfig(libxml-2.0)
@@ -97,6 +98,7 @@ modifying the official lenses, or when creating new ones.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure \

remove-unportable-tests.patch

@@ -0,0 +1,40 @@
+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.
+---
+ ChangeLog               | 8 ++++++++
+ tests/test-perror2.c    | 3 ---
+ tests/test-strerror_r.c | 3 ---
+ 3 files changed, 8 insertions(+), 6 deletions(-)
+
+--- 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);
+--- 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