[DebianGIS-dev] r2570 - packages/libkml/trunk/debian/patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-10-27 15:52:12 +0000 (Tue, 27 Oct 2009)
New Revision: 2570

Modified:
   packages/libkml/trunk/debian/patches/clone.diff
Log:
Use __clone2 instead of clone call.


Modified: packages/libkml/trunk/debian/patches/clone.diff
===================================================================
--- packages/libkml/trunk/debian/patches/clone.diff	2009-10-27 11:27:14 UTC (rev 2569)
+++ packages/libkml/trunk/debian/patches/clone.diff	2009-10-27 15:52:12 UTC (rev 2570)
@@ -1,7 +1,7 @@
 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 12:22:10.000000000 +0100
-+++ libkml-1.0.1/third_party/googletest-r108/src/gtest-death-test.cc	2009-10-27 12:22:46.000000000 +0100
+--- libkml-1.0.1.orig/third_party/googletest-r108/src/gtest-death-test.cc	2009-10-27 12:23:01.000000000 +0100
++++ libkml-1.0.1/third_party/googletest-r108/src/gtest-death-test.cc	2009-10-27 16:51:00.000000000 +0100
 @@ -594,6 +594,8 @@
  // A threadsafe implementation of fork(2) for threadsafe-style death tests
  // that uses clone(2).  It dies with an error message if anything goes
@@ -11,3 +11,17 @@
  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 +605,13 @@
+   void* const stack_top =
+       static_cast<char*>(stack) + (stack_grows_down ? stack_size : 0);
+   ExecDeathTestArgs args = { argv, close_fd };
++#ifdef __ia64__
++  const pid_t child_pid = __clone2(&ExecDeathTestChildMain, stack_top, stack_size,
++                                SIGCHLD, &args);
++#else
+   const pid_t child_pid = clone(&ExecDeathTestChildMain, stack_top,
+                                 SIGCHLD, &args);
++#endif
+   GTEST_DEATH_TEST_CHECK_(child_pid != -1);
+   GTEST_DEATH_TEST_CHECK_(munmap(stack, stack_size) != -1);
+   return child_pid;