Package: im-sdk
Version: 12.3.91-6.4
Severity: important
Tags: patch
User: [email protected]
Usertags: kfreebsd
Hi,
please find attached some patches to help get im-sdk built on
GNU/kFreeBSD. I've now got it failing as described in #548465.
Cc'ing David since he was the last NMUer.
Mraw,
KiBi.
--- a/build-tree/iiimf-12.3.91-svn2814/lib/iiimp/data/comp-file-operation.c
+++ b/build-tree/iiimf-12.3.91-svn2814/lib/iiimp/data/comp-file-operation.c
@@ -134,7 +134,7 @@ iiimp_file_operation_fcntl_flock_type_i2
return F_WRLCK;
case IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_UNLCK:
return F_UNLCK;
-#if !defined(__linux__)
+#if !defined(__linux__) && !defined(__GLIBC__)
case IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_UNLKSYS:
return F_UNLKSYS;
#endif
@@ -155,7 +155,7 @@ iiimp_file_operation_fcntl_flock_type_l2
return IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_WRLCK;
case F_UNLCK:
return IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_UNLCK;
-#if !defined(__linux__)
+#if !defined(__linux__) && !defined(__GLIBC__)
case F_UNLKSYS:
return IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_UNLKSYS;
#endif
@@ -7323,7 +7323,7 @@ fcntl_cmd_flock_type_string(
return "F_WRLCK";
case F_UNLCK:
return "F_UNLCK";
-#if !defined(__linux__)
+#if !defined(__linux__) && !defined(__GLIBC__)
case F_UNLKSYS:
return "F_UNLKSYS";
#endif
--- a/build-tree/iiimf-12.3.91-svn2814/leif/sampleja3/xaux_common/xaux_ext_common.c
+++ b/build-tree/iiimf-12.3.91-svn2814/leif/sampleja3/xaux_common/xaux_ext_common.c
@@ -841,7 +841,7 @@ HelpInvoke(
return;
}
-#ifdef linux
+#if defined(linux) || defined(__GLIBC__)
pid = fork();
#else
pid = fork1();
--- a/build-tree/iiimf-12.3.91-svn2814/leif/sampleja3/xaux_common/xaux_ext_common.h
+++ b/build-tree/iiimf-12.3.91-svn2814/leif/sampleja3/xaux_common/xaux_ext_common.h
@@ -80,7 +80,7 @@ extern Bool xaux_ext_Start(xaux_class_t
extern Bool xaux_ext_Draw(xaux_class_t *, aux_ext_data_t *);
extern Bool xaux_ext_Done(xaux_class_t *, aux_ext_data_t *);
-#ifndef linux
+#if !defined(linux) && !defined(__GLIBC__)
#include <Xm/Xm.h>
#endif
--- a/build-tree/iiimf-12.3.91-svn2814/include/iiimp/iiimp-data.h
+++ b/build-tree/iiimf-12.3.91-svn2814/include/iiimp/iiimp-data.h
@@ -13,7 +13,7 @@
#include <stdint.h>
#endif
-#if defined(linux) || defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(linux) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__GLIBC__)
typedef unsigned char uchar_t;
typedef unsigned int uint_t;
#endif /* linux || freebsd */
