Bug#647971: cd-discid: FTBFS on hurd-i386

[Timur Birsh]

tags 647971 pending
thanks

Hello,

On Tuesday 08 November 2011 07:21:02 you wrote:
 cd-discid currently FTBFS on hurd-i386, due to inclusion of a
 linux-specific header linux/cdrom.h. The attached patch fixes it by
 including
 sys/cdrom.h instead, could you please apply it?

Thanks! RFS: http://permalink.gmane.org/gmane.linux.debian.devel.mentors/52537

Timur



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#647971: cd-discid: FTBFS on hurd-i386

[Samuel Thibault]

Package: cd-discid
Version: 1.2-1
Severity: important
Tags: patch
User: debian-h...@lists.debian.org
Usertags: hurd

Hello,

cd-discid currently FTBFS on hurd-i386, due to inclusion of a linux-specific
header linux/cdrom.h. The attached patch fixes it by including
sys/cdrom.h instead, could you please apply it?

Thanks,
Samuel

-- System Information:
Debian Release: wheezy/sid
  APT prefers unreleased
  APT policy: (500, 'unreleased'), (500, 'unstable')
Architecture: hurd-i386 (i686-AT386)

Kernel: GNU-Mach 1.3.99/Hurd-0.3
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -ur cd-discid-1.2.orig/cd-discid.c cd-discid-1.2/cd-discid.c
--- cd-discid-1.2.orig/cd-discid.c  2011-04-28 10:51:21.0 +0200
+++ cd-discid-1.2/cd-discid.c   2011-11-08 02:19:17.0 +0100
@@ -29,6 +29,11 @@
 #include linux/cdrom.h
 #definecdte_track_address  cdte_addr.lba
 #defineDEVICE_NAME /dev/cdrom
+#elif defined(__GNU__)
+
+#include sys/cdrom.h
+#definecdte_track_address  cdte_addr.lba
+#defineDEVICE_NAME /dev/cd0
 #elif defined(sun)  defined(unix)  defined(__SVR4)
 
 #include sys/cdio.h