[Bug-xorriso] building libisofs-1.4.4, libburn-1.4.4, libisoburn-1.4.4 on OpenBSD

[SASANO Takayoshi]

Hello,

I am trying to build libisofs/libburn/libisoburn-1.4.4 on OpenBSD-5.9/amd64.
At least "xorriso -devices" is working, is there any good method to test?

# uname -rsm
OpenBSD 5.9 amd64
# ./xorriso -devices
xorriso 1.4.4 : RockRidge filesystem manipulator, libburnia project.

Beginning to scan for devices ...
Full drive scan done
-----------------------------------------------------------------------------
0  -dev '/dev/rcd0c' rwr--- :  'HL-DT-ST' 'BD-RE BH14NS48'
-----------------------------------------------------------------------------
#

Here is the diff, especially xorriso (libisoburn) requires 
#include <pthread.h> to include "xorriso_private.h".

Regards,

-- 
SASANO Takayoshi <address@hidden>


diff -uNpr libisofs-1.4.4.orig/libisofs/aaip_0_2.c 
libisofs-1.4.4/libisofs/aaip_0_2.c
--- libisofs-1.4.4.orig/libisofs/aaip_0_2.c     Tue Dec 15 01:15:12 2015
+++ libisofs-1.4.4/libisofs/aaip_0_2.c  Wed Jul 20 11:54:23 2016
@@ -2209,7 +2209,7 @@ ex:;
 #endif /* ! NIX */
 
 #else
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 
 #include "aaip-os-freebsd.c"
 
@@ -2230,7 +2230,7 @@ ex:;
 #include "aaip-os-dummy.c"
 
 #endif /* ! __linux */
-#endif /* ! __NetBSD__ */
+#endif /* ! (defined(__NetBSD__) || defined(__OpenBSD__) */
 #endif /* ! __FreeBSD_kernel__ */
 #endif /* ! __FreeBSD__ */
 

diff -uNpr libburn-1.4.4.orig/libburn/os-netbsd.h 
libburn-1.4.4/libburn/os-netbsd.h
--- libburn-1.4.4.orig/libburn/os-netbsd.h      Fri Jul  1 20:25:22 2016
+++ libburn-1.4.4/libburn/os-netbsd.h   Wed Jul 20 12:05:42 2016
@@ -34,10 +34,17 @@
 #define BURN_OS_SIGNAL_COUNT 20
 
 /** To list all signals which shall surely not be caught */
+#if defined(__NetBSD__)
 #define BURN_OS_NON_SIGNAL_MACRO_LIST \
  SIGKILL, SIGURG, SIGSTOP, SIGTSTP, SIGCONT, \
  SIGCHLD, SIGTTIN, SIGTTOU, SIGIO, SIGWINCH, \
  SIGINFO, SIGPWR
+#elif defined(__OpenBSD__)
+#define BURN_OS_NON_SIGNAL_MACRO_LIST \
+ SIGKILL, SIGURG, SIGSTOP, SIGTSTP, SIGCONT, \
+ SIGCHLD, SIGTTIN, SIGTTOU, SIGIO, SIGWINCH, \
+ SIGINFO
+#endif
 
 /* The number of above list items */
 #define BURN_OS_NON_SIGNAL_COUNT 12
diff -uNpr libburn-1.4.4.orig/libburn/os.h libburn-1.4.4/libburn/os.h
--- libburn-1.4.4.orig/libburn/os.h     Fri Jul  1 20:25:22 2016
+++ libburn-1.4.4/libburn/os.h  Wed Jul 20 11:58:42 2016
@@ -16,7 +16,7 @@
 
 
 /* <<< Until it is known whether this adapter would work on OpenBSD too */
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 #define Libburn_use_sg_netbsD
 #endif
 
diff -uNpr libburn-1.4.4.orig/libburn/sg-netbsd.c 
libburn-1.4.4/libburn/sg-netbsd.c
--- libburn-1.4.4.orig/libburn/sg-netbsd.c      Fri Jul  1 20:25:22 2016
+++ libburn-1.4.4/libburn/sg-netbsd.c   Wed Jul 20 12:10:32 2016
@@ -687,10 +687,16 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *h
                {ret = 0; goto ex;}
        if (addr.type != TYPE_SCSI)
                {ret = 0; goto ex;}
-       *bus_no = *host_no = addr.addr.scsi.scbus;
        *channel_no = 0;
+#if defined(__NetBSD__)
+       *bus_no = *host_no = addr.addr.scsi.scbus;
        *target_no = addr.addr.scsi.target;
        *lun_no = addr.addr.scsi.lun;
+#elif defined(__OpenBSD__)
+       *bus_no = *host_no = addr.scbus;
+       *target_no = addr.target;
+       *lun_no = addr.lun;
+#endif
        ret = 1;
 ex:;
        if (fd != -1)
diff -uNpr libburn-1.4.4.orig/libburn/sg.c libburn-1.4.4/libburn/sg.c
--- libburn-1.4.4.orig/libburn/sg.c     Fri Jul  1 20:25:22 2016
+++ libburn-1.4.4/libburn/sg.c  Wed Jul 20 11:59:53 2016
@@ -12,7 +12,7 @@
 
 
 /* <<< Until it is known whether this adapter would work on OpenBSD too */
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 #define Libburn_use_sg_netbsD
 #endif
 

diff -uNpr libisoburn-1.4.4.orig/xorriso/aux_objects.c 
libisoburn-1.4.4/xorriso/aux_objects.c
--- libisoburn-1.4.4.orig/xorriso/aux_objects.c Sat Sep 15 02:52:21 2012
+++ libisoburn-1.4.4/xorriso/aux_objects.c      Wed Jul 20 12:54:19 2016
@@ -38,6 +38,7 @@
 #include <utime.h>
 #include <dirent.h>
 #include <errno.h>
+#include <pthread.h>
 
 
 #include "xorriso.h"
diff -uNpr libisoburn-1.4.4.orig/xorriso/check_media.c 
libisoburn-1.4.4/xorriso/check_media.c
--- libisoburn-1.4.4.orig/xorriso/check_media.c Sat Nov  7 19:56:02 2015
+++ libisoburn-1.4.4/xorriso/check_media.c      Wed Jul 20 12:55:04 2016
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <pthread.h>
 
 /* O_BINARY is needed for Cygwin but undefined elsewhere */
 #ifndef O_BINARY
diff -uNpr libisoburn-1.4.4.orig/xorriso/cmp_update.c 
libisoburn-1.4.4/xorriso/cmp_update.c
--- libisoburn-1.4.4.orig/xorriso/cmp_update.c  Sat Oct 17 00:51:03 2015
+++ libisoburn-1.4.4/xorriso/cmp_update.c       Wed Jul 20 13:01:30 2016
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <pthread.h>
 #include <pwd.h>
 #include <grp.h>
 
diff -uNpr libisoburn-1.4.4.orig/xorriso/disk_ops.c 
libisoburn-1.4.4/xorriso/disk_ops.c
--- libisoburn-1.4.4.orig/xorriso/disk_ops.c    Fri Feb  5 23:57:52 2016
+++ libisoburn-1.4.4/xorriso/disk_ops.c Wed Jul 20 13:10:53 2016
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <pthread.h>
 #include <pwd.h>
 #include <grp.h>
 
diff -uNpr libisoburn-1.4.4.orig/xorriso/emulators.c 
libisoburn-1.4.4/xorriso/emulators.c
--- libisoburn-1.4.4.orig/xorriso/emulators.c   Wed Apr 27 18:29:51 2016
+++ libisoburn-1.4.4/xorriso/emulators.c        Wed Jul 20 12:55:39 2016
@@ -23,6 +23,7 @@
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <pthread.h>
 
 #include "xorriso.h"
 #include "xorriso_private.h"
diff -uNpr libisoburn-1.4.4.orig/xorriso/filters.c 
libisoburn-1.4.4/xorriso/filters.c
--- libisoburn-1.4.4.orig/xorriso/filters.c     Thu Sep 17 21:12:41 2015
+++ libisoburn-1.4.4/xorriso/filters.c  Wed Jul 20 13:05:04 2016
@@ -22,6 +22,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <errno.h>
+#include <pthread.h>
 
 #include "lib_mgt.h"
 #include "iso_tree.h"
diff -uNpr libisoburn-1.4.4.orig/xorriso/findjob.c 
libisoburn-1.4.4/xorriso/findjob.c
--- libisoburn-1.4.4.orig/xorriso/findjob.c     Mon Apr 25 19:09:34 2016
+++ libisoburn-1.4.4/xorriso/findjob.c  Wed Jul 20 12:54:49 2016
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <dirent.h>
 #include <errno.h>
+#include <pthread.h>
 
 
 #include "xorriso.h"
diff -uNpr libisoburn-1.4.4.orig/xorriso/iso_img.c 
libisoburn-1.4.4/xorriso/iso_img.c
--- libisoburn-1.4.4.orig/xorriso/iso_img.c     Mon Apr 25 19:09:34 2016
+++ libisoburn-1.4.4/xorriso/iso_img.c  Wed Jul 20 13:03:49 2016
@@ -23,6 +23,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <errno.h>
+#include <pthread.h>
 
 #include <sys/wait.h>
 
diff -uNpr libisoburn-1.4.4.orig/xorriso/iso_manip.c 
libisoburn-1.4.4/xorriso/iso_manip.c
--- libisoburn-1.4.4.orig/xorriso/iso_manip.c   Mon Apr 25 19:09:34 2016
+++ libisoburn-1.4.4/xorriso/iso_manip.c        Wed Jul 20 13:04:21 2016
@@ -22,6 +22,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <errno.h>
+#include <pthread.h>
 
 
 #include "xorriso.h"
diff -uNpr libisoburn-1.4.4.orig/xorriso/iso_tree.c 
libisoburn-1.4.4/xorriso/iso_tree.c
--- libisoburn-1.4.4.orig/xorriso/iso_tree.c    Mon Apr 25 19:09:34 2016
+++ libisoburn-1.4.4/xorriso/iso_tree.c Wed Jul 20 13:04:04 2016
@@ -23,7 +23,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <errno.h>
-
+#include <pthread.h>
 #include <pwd.h>
 #include <grp.h>
 
diff -uNpr libisoburn-1.4.4.orig/xorriso/match.c 
libisoburn-1.4.4/xorriso/match.c
--- libisoburn-1.4.4.orig/xorriso/match.c       Wed Nov  4 19:54:29 2015
+++ libisoburn-1.4.4/xorriso/match.c    Wed Jul 20 12:55:27 2016
@@ -23,6 +23,7 @@
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <pthread.h>
 
 #include "xorriso.h"
 #include "xorriso_private.h"
diff -uNpr libisoburn-1.4.4.orig/xorriso/opts_a_c.c 
libisoburn-1.4.4/xorriso/opts_a_c.c
--- libisoburn-1.4.4.orig/xorriso/opts_a_c.c    Fri Feb  5 19:06:25 2016
+++ libisoburn-1.4.4/xorriso/opts_a_c.c Wed Jul 20 13:02:25 2016
@@ -23,6 +23,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <errno.h>
+#include <pthread.h>
 
 /* for -charset */
 #include <iconv.h>
diff -uNpr libisoburn-1.4.4.orig/xorriso/opts_d_h.c 
libisoburn-1.4.4/xorriso/opts_d_h.c
--- libisoburn-1.4.4.orig/xorriso/opts_d_h.c    Fri Mar 18 22:55:09 2016
+++ libisoburn-1.4.4/xorriso/opts_d_h.c Wed Jul 20 13:02:44 2016
@@ -23,6 +23,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <errno.h>
+#include <pthread.h>
 
 
 #include "xorriso.h"
diff -uNpr libisoburn-1.4.4.orig/xorriso/opts_i_o.c 
libisoburn-1.4.4/xorriso/opts_i_o.c
--- libisoburn-1.4.4.orig/xorriso/opts_i_o.c    Tue Mar  1 23:15:17 2016
+++ libisoburn-1.4.4/xorriso/opts_i_o.c Wed Jul 20 13:03:01 2016
@@ -23,6 +23,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <errno.h>
+#include <pthread.h>
 
 #include "xorriso.h"
 #include "xorriso_private.h"
diff -uNpr libisoburn-1.4.4.orig/xorriso/opts_p_z.c 
libisoburn-1.4.4/xorriso/opts_p_z.c
--- libisoburn-1.4.4.orig/xorriso/opts_p_z.c    Fri Mar 18 22:55:09 2016
+++ libisoburn-1.4.4/xorriso/opts_p_z.c Wed Jul 20 13:03:17 2016
@@ -23,6 +23,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <errno.h>
+#include <pthread.h>
 
 
 #include "xorriso.h"
diff -uNpr libisoburn-1.4.4.orig/xorriso/parse_exec.c 
libisoburn-1.4.4/xorriso/parse_exec.c
--- libisoburn-1.4.4.orig/xorriso/parse_exec.c  Fri Mar 18 22:55:09 2016
+++ libisoburn-1.4.4/xorriso/parse_exec.c       Wed Jul 20 13:02:03 2016
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <pthread.h>
 #include <pwd.h>
 #include <grp.h>
 #include <sys/resource.h>
@@ -33,12 +34,6 @@
 #include "xorriso.h"
 #include "xorriso_private.h"
 #include "xorrisoburn.h"
-
-
-#ifdef Xorriso_fetch_with_msg_queueS
-#include <pthread.h>
-#endif
-
 
 /* @param flag bit0= do not warn of wildcards
                bit1= these are disk_paths
diff -uNpr libisoburn-1.4.4.orig/xorriso/read_run.c 
libisoburn-1.4.4/xorriso/read_run.c
--- libisoburn-1.4.4.orig/xorriso/read_run.c    Mon Nov  9 01:40:45 2015
+++ libisoburn-1.4.4/xorriso/read_run.c Wed Jul 20 13:04:48 2016
@@ -24,7 +24,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <errno.h>
-
+#include <pthread.h>
 #include <fcntl.h>
 #include <utime.h>
 
diff -uNpr libisoburn-1.4.4.orig/xorriso/sort_cmp.c 
libisoburn-1.4.4/xorriso/sort_cmp.c
--- libisoburn-1.4.4.orig/xorriso/sort_cmp.c    Fri Feb  5 23:57:52 2016
+++ libisoburn-1.4.4/xorriso/sort_cmp.c Wed Jul 20 13:03:32 2016
@@ -22,6 +22,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <errno.h>
+#include <pthread.h>
 
 
 #include "base_obj.h"
diff -uNpr libisoburn-1.4.4.orig/xorriso/write_run.c 
libisoburn-1.4.4/xorriso/write_run.c
--- libisoburn-1.4.4.orig/xorriso/write_run.c   Fri Feb  5 19:06:25 2016
+++ libisoburn-1.4.4/xorriso/write_run.c        Wed Jul 20 13:04:35 2016
@@ -23,7 +23,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <errno.h>
-
+#include <pthread.h>
 #include <fcntl.h>
 
 #ifdef HAVE_STDINT_H