unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
blob 1d325bce96b50defca31c2150243a679c6f01c94 1631 bytes (raw)
name: packages/patches/libcdio-glibc-compat.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
 
Fix test failure with glibc 2.36:

  https://savannah.gnu.org/bugs/?62948

Patch taken from upstream:

  https://git.savannah.gnu.org/cgit/libcdio.git/commit/?id=56335fff0f21d294cd0e478d49542a43e9495ed0

diff --git a/test/driver/realpath.c b/test/driver/realpath.c
index 289253e..cd46d62 100644
--- a/test/driver/realpath.c
+++ b/test/driver/realpath.c
@@ -1,5 +1,7 @@
 /* -*- C -*-
-  Copyright (C) 2010-2012, 2015, 2017 Rocky Bernstein <rocky@gnu.org>
+
+  Copyright (C) 2010-2012, 2015, 2017, 2022 Rocky Bernstein
+  <rocky@gnu.org>
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -175,16 +177,17 @@ main(int argc, const char *argv[])
         rc = check_rc(symlink(psz_symlink_file, psz_symlink_file),
                       "symlink", psz_symlink_file);
         if (0 == rc) {
-            cdio_realpath(psz_symlink_file, psz_file_check);
-            if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
+            char *retvalue = cdio_realpath(psz_symlink_file, psz_file_check);
+            if (0 != retvalue) {
+	      if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
                 fprintf(stderr, "direct cdio_realpath cycle test failed. %s vs %s\n",
                         psz_file_check, symlink_file);
 		rc = 5;
 		goto err_exit;
+	      }
+	      check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
             }
-            check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
         }
-
     }
 
     check_rc(unlink(psz_orig_file), "unlink", psz_orig_file);

debug log:

solving 1d325bce96b50defca31c2150243a679c6f01c94 ...
found 1d325bce96b50defca31c2150243a679c6f01c94 in https://git.savannah.gnu.org/cgit/guix.git

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).