Bug#530606: protobuf: FTBFS on ia64

[Sune Vuorela]

Hi

With the following patch, it builds on ia64 and on hppa.

It is not -j2 safe though, haven't been able to get to the bottom of that. 

Patches to my patch is appreciated.

/Sune
-- 
Man, how may I link the pin?

First of all from MkLinux you should never rename a jumper to get access on 
the Ultra IP bus.


diff -u protobuf-2.0.3/debian/changelog protobuf-2.0.3/debian/changelog
--- protobuf-2.0.3/debian/changelog
+++ protobuf-2.0.3/debian/changelog
@@ -1,3 +1,11 @@
+protobuf (2.0.3-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix building of test suites on ia64
+  * Don't build arch all packages on all builds. Makes it build on hppa.
+
+ -- Sune Vuorela <deb...@pusling.com>  Mon, 01 Jun 2009 18:30:14 -0600
+
 protobuf (2.0.3-2) unstable; urgency=low
 
   * Fix the binary-arch/binary-common interaction by only calling
diff -u protobuf-2.0.3/debian/rules protobuf-2.0.3/debian/rules
--- protobuf-2.0.3/debian/rules
+++ protobuf-2.0.3/debian/rules
@@ -43,7 +43,7 @@
 
 
 #Architecture
-build: build-arch build-indep
+build: build-arch
 
 build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp
@@ -62,7 +62,7 @@
 	touch $@
 
 build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp build-arch-stamp
+build-indep-stamp: configure-stamp
 
 	# python bindings
 	cd python && python setup.py build
@@ -97,8 +97,8 @@
 
 	dh_clean
 
-install: install-indep install-arch
-install-indep:
+install: install-arch
+install-indep: build-indep binary-arch
 	dh_testdir
 	dh_testroot
 	dh_prep -i
@@ -114,7 +114,7 @@
 	dh_install -i
 
 
-install-arch:
+install-arch: build-arch
 	dh_testdir
 	dh_testroot
 	dh_prep -s
@@ -156,7 +156,7 @@
 	dh_builddeb
 
 # Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
+binary-indep: build-indep install-indep binary-arch
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture dependant packages using the common target.
only in patch2:
unchanged:
--- protobuf-2.0.3.orig/src/gtest/gtest-death-test.cc
+++ protobuf-2.0.3/src/gtest/gtest-death-test.cc
@@ -37,6 +37,16 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
+#include <sched.h>
+
+#ifdef __ia64__
+extern "C" {
+int  __clone2(int (*fn) (void *arg), void *child_stack_base,
+  size_t child_stack_size, int flags, void *arg,
+  pid_t *parent_tid, void *tls, pid_t *child_tid);
+}
+#endif
+
 
 #include <gtest/gtest-message.h>
 #include <gtest/internal/gtest-string.h>
@@ -579,13 +589,20 @@
   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, NULL, NULL, NULL);
+#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;
 }
 
+
 // The AssumeRole process for a fork-and-exec death test.  It re-executes the
 // main program from the beginning, setting the --gtest_filter
 // and --gtest_internal_run_death_test flags to cause only the current

signature.asc
Description: This is a digitally signed message part.