[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
54/416: gnu: libcdio: Fix test failure with glibc 2.36.
From: |
guix-commits |
Subject: |
54/416: gnu: libcdio: Fix test failure with glibc 2.36. |
Date: |
Fri, 14 Apr 2023 15:25:16 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit b9bf70c346c3f2bcdf31af25cd72403c1dfa2dc9
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Nov 23 20:41:36 2022 +0100
gnu: libcdio: Fix test failure with glibc 2.36.
* gnu/packages/patches/libcdio-glibc-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/cdrom.scm (libcdio)[source](patches): New field.
---
gnu/local.mk | 1 +
gnu/packages/cdrom.scm | 1 +
gnu/packages/patches/libcdio-glibc-compat.patch | 43 +++++++++++++++++++++++++
3 files changed, 45 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index d4d5740b86..9ff3caa67f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1491,6 +1491,7 @@ dist_patch_DATA =
\
%D%/packages/patches/lierolibre-newer-libconfig.patch \
%D%/packages/patches/lierolibre-remove-arch-warning.patch \
%D%/packages/patches/lierolibre-try-building-other-arch.patch \
+ %D%/packages/patches/libcdio-glibc-compat.patch \
%D%/packages/patches/linbox-fix-pkgconfig.patch \
%D%/packages/patches/linphone-desktop-without-sdk.patch \
%D%/packages/patches/linux-libre-infodocs-target.patch \
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index cfb2b6b686..dcb90a634d 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -113,6 +113,7 @@ caching facility provided by the library.")
(method url-fetch)
(uri (string-append "mirror://gnu/libcdio/libcdio-"
version ".tar.bz2"))
+ (patches (search-patches "libcdio-glibc-compat.patch"))
(sha256
(base32
"0avi6apv5ydjy6b9c3z9a46rvp5i57qyr09vr7x4nndxkmcfjl45"))))
diff --git a/gnu/packages/patches/libcdio-glibc-compat.patch
b/gnu/packages/patches/libcdio-glibc-compat.patch
new file mode 100644
index 0000000000..1d325bce96
--- /dev/null
+++ b/gnu/packages/patches/libcdio-glibc-compat.patch
@@ -0,0 +1,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);
- 64/416: gnu: sdl2-ttf: Update to 2.20.1., (continued)
- 64/416: gnu: sdl2-ttf: Update to 2.20.1., guix-commits, 2023/04/14
- 65/416: gnu: sdl2-ttf: Fix source snippet., guix-commits, 2023/04/14
- 19/416: gnu: libx264: Update to 164-0.b093bbe., guix-commits, 2023/04/14
- 34/416: gnu: libwebp: Update to 1.2.4., guix-commits, 2023/04/14
- 35/416: gnu: bluez: Update to 5.66., guix-commits, 2023/04/14
- 37/416: gnu: glew: Update to 2.2.0., guix-commits, 2023/04/14
- 46/416: gnu: Add vulkan-memory-allocator., guix-commits, 2023/04/14
- 47/416: gnu: vulkan-loader: Update to 1.3.232., guix-commits, 2023/04/14
- 53/416: gnu: modem-manager: Update to 1.18.12., guix-commits, 2023/04/14
- 39/416: gnu: perl-http-message: Update to 6.37., guix-commits, 2023/04/14
- 54/416: gnu: libcdio: Fix test failure with glibc 2.36.,
guix-commits <=
- 58/416: gnu: sdl2-mixer: Add upstream-name property., guix-commits, 2023/04/14
- 69/416: gnu: rust-xcb: Add 1.2.0., guix-commits, 2023/04/14
- 20/416: gnu: libvpx: Update to 1.12.0., guix-commits, 2023/04/14
- 28/416: gnu: vulkan-loader: Update to sdk-1.3.231.1., guix-commits, 2023/04/14
- 40/416: gnu: perl-try-tiny: Update to 0.31., guix-commits, 2023/04/14
- 43/416: gnu: perl-io-socket-ssl: Update to 2.075., guix-commits, 2023/04/14
- 44/416: gnu: libpipeline: Update to 1.5.6., guix-commits, 2023/04/14
- 48/416: gnu: vulkan-loader: Remove input labels., guix-commits, 2023/04/14
- 55/416: gnu: sdl2: Update to 2.26.0., guix-commits, 2023/04/14
- 66/416: gnu: libva: Update to 2.16.0., guix-commits, 2023/04/14