[DebianGIS-dev] r2574 - in packages/libkml/trunk/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-10-27 19:26:17 +0000 (Tue, 27 Oct 2009)
New Revision: 2574

Modified:
   packages/libkml/trunk/debian/changelog
   packages/libkml/trunk/debian/patches/clone.diff
Log:
A shorter patch for ia64.


Modified: packages/libkml/trunk/debian/changelog
===================================================================
--- packages/libkml/trunk/debian/changelog	2009-10-27 16:23:44 UTC (rev 2573)
+++ packages/libkml/trunk/debian/changelog	2009-10-27 19:26:17 UTC (rev 2574)
@@ -1,7 +1,7 @@
-libkml (1.0.1-3) unstable; urgency=low
+libkml (1.0.1-3) unstable; urgency=high
 
-  * Added clone.diff patch to declare clone(2) call as used in google test
-    stuff. This patch solves possibly a FTBS on ia64.
+  * Added clone.diff patch to use __clone2() instead of clone() on ia64.
+    This patch solves a FTBS on ia64.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 27 Oct 2009 12:24:40 +0100
 

Modified: packages/libkml/trunk/debian/patches/clone.diff
===================================================================
--- packages/libkml/trunk/debian/patches/clone.diff	2009-10-27 16:23:44 UTC (rev 2573)
+++ packages/libkml/trunk/debian/patches/clone.diff	2009-10-27 19:26:17 UTC (rev 2574)
@@ -1,23 +1,22 @@
 Index: libkml-1.0.1/third_party/googletest-r108/src/gtest-death-test.cc
 ===================================================================
---- libkml-1.0.1.orig/third_party/googletest-r108/src/gtest-death-test.cc	2009-10-27 17:01:02.000000000 +0100
-+++ libkml-1.0.1/third_party/googletest-r108/src/gtest-death-test.cc	2009-10-27 17:22:23.000000000 +0100
-@@ -594,6 +594,14 @@
+--- libkml-1.0.1.orig/third_party/googletest-r108/src/gtest-death-test.cc	2009-10-27 17:23:16.000000000 +0100
++++ libkml-1.0.1/third_party/googletest-r108/src/gtest-death-test.cc	2009-10-27 20:23:45.000000000 +0100
+@@ -594,6 +594,13 @@
  // A threadsafe implementation of fork(2) for threadsafe-style death tests
  // that uses clone(2).  It dies with an error message if anything goes
  // wrong.
 +
++// ia64 has __clone2 instead of clone on Linux.
 +#ifdef __ia64__
-+extern "C" {
-+extern int  __clone2(int (*fn) (void *arg), void *child_stack_base,
++extern "C" int  __clone2(int (*fn) (void *arg), void *child_stack_base,
 +                    size_t child_stack_size, int flags, void *arg, ...);
-+}
 +#endif
 +
  static pid_t ExecDeathTestFork(char* const* argv, int close_fd) {
    static const bool stack_grows_down = StackGrowsDown();
    const size_t stack_size = getpagesize();
-@@ -603,8 +611,13 @@
+@@ -603,8 +610,13 @@
    void* const stack_top =
        static_cast<char*>(stack) + (stack_grows_down ? stack_size : 0);
    ExecDeathTestArgs args = { argv, close_fd };