[Pkg-phototools-commits] [SCM] openimageio branch, master, updated. debian/1.0.3+dfsg0-1-21-g6eb9b9c
Matteo F. Vescovi
mfv.debian at gmail.com
Sun May 20 14:16:57 UTC 2012
The following commit has been merged in the master branch:
commit 6eb9b9cc72254296dcbabc2b78c5351811122b42
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date: Sun May 20 15:34:39 2012 +0200
debian/patches/: #0003 added to fix FTBFS on Hurd
Thanks: Pino Toscano (pino) for the hint
diff --git a/debian/patches/0003-Fix_FTBFS_on_Hurd.patch b/debian/patches/0003-Fix_FTBFS_on_Hurd.patch
new file mode 100644
index 0000000..d6ad092
--- /dev/null
+++ b/debian/patches/0003-Fix_FTBFS_on_Hurd.patch
@@ -0,0 +1,56 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Sun, 20 May 2012 15:33:57 +0200
+Subject: Fix_FTBFS_on_Hurd
+
+---
+ src/iv/ivmain.cpp | 2 +-
+ src/libutil/sysutil.cpp | 9 ++++++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/iv/ivmain.cpp b/src/iv/ivmain.cpp
+index 9c9e21e..2c9e06d 100644
+--- a/src/iv/ivmain.cpp
++++ b/src/iv/ivmain.cpp
+@@ -127,7 +127,7 @@ put_in_background (int, char* [])
+ // But it suffers from the same problem on OS X, and seems to just be
+ // a wrapper for fork.
+
+-#ifdef __linux
++#if defined(__linux__) || defined(__GLIBC__)
+ // Simplest case:
+ daemon (1, 1);
+ return true;
+diff --git a/src/libutil/sysutil.cpp b/src/libutil/sysutil.cpp
+index 3a24c24..9d88cb6 100644
+--- a/src/libutil/sysutil.cpp
++++ b/src/libutil/sysutil.cpp
+@@ -63,6 +63,11 @@
+ # include <sys/resource.h>
+ #endif
+
++#ifdef __GNU__
++# include <unistd.h>
++# include <sys/ioctl.h>
++#endif
++
+ #include "dassert.h"
+
+ #include "sysutil.h"
+@@ -165,6 +170,8 @@ Sysutil::this_program_path ()
+ size_t cb = sizeof(filename);
+ int r=1;
+ sysctl(mib, 4, filename, &cb, NULL, 0);
++#elif defined(__GNU__)
++ int r = 0;
+ #else
+ // No idea what platform this is
+ ASSERT (0);
+@@ -194,7 +201,7 @@ Sysutil::terminal_columns ()
+ {
+ int columns = 80; // a decent guess, if we have nothing more to go on
+
+-#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+ struct winsize w;
+ ioctl (0, TIOCGWINSZ, &w);
+ columns = w.ws_col;
diff --git a/debian/patches/series b/debian/patches/series
index 3e4140c..38b0f4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-Fix_docs_generation.patch
0002-Fix_usleep_issue_on_kFreeBSD.patch
+0003-Fix_FTBFS_on_Hurd.patch
--
OpenImageIO packaging
More information about the Pkg-phototools-commits
mailing list