On Tue, May 26, 2009 at 20:30:37 +0200, Iustin Pop wrote: > Thanks for the report. I'm currently on a trip and thus won't be able to work > on this for about a week or so. If this is blocks other packages (and the > release hint is not enough), a NMU would be very welcome. > Hi Iustin,
I'll NMU with the attached patch in a moment. Cheers, Julien
diff -u protobuf-2.0.3/debian/control protobuf-2.0.3/debian/control --- protobuf-2.0.3/debian/control +++ protobuf-2.0.3/debian/control @@ -2,9 +2,8 @@ Section: devel Priority: extra Maintainer: Iustin Pop <iu...@k1024.org> -Build-Depends: debhelper (>= 7), python (>= 2.3.5-11), python-setuptools (>= 0.6c8), xmlto, - ant, openjdk-6-jdk -Build-Depends-Indep: python-support (>= 0.6) +Build-Depends: debhelper (>= 7), python (>= 2.3.5-11), python-setuptools (>= 0.6c8), xmlto, ant +Build-Depends-Indep: python-support (>= 0.6), openjdk-6-jdk Standards-Version: 3.8.1 Homepage: http://code.google.com/p/protobuf/ Vcs-Browser: http://git.debian.org/?p=collab-maint/protobuf.git 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,16 @@ +protobuf (2.0.3-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Medium urgency for RC bugfix. + * Fix building of test suites on ia64: use __clone2() instead of clone(), + which doesn't exist there (closes: #530606). Patch by Sune Vuorela. + * Only build the java and python bindings when building the arch:all + packages. Move openjdk to Build-Depends-Indep. This should allow + building on hppa, which doesn't have openjdk. Based on a patch by Sune + Vuorela (but any bugs are mine). + + -- Julien Cristau <jcris...@debian.org> Tue, 02 Jun 2009 14:45:32 +0200 + 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: build-arch-stamp # python bindings cd python && python setup.py build @@ -98,7 +98,7 @@ dh_clean install: install-indep install-arch -install-indep: +install-indep: build-indep 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,11 +156,11 @@ dh_builddeb # Build architecture independant packages using the common target. -binary-indep: build-indep install-indep +binary-indep: install-indep $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common # Build architecture dependant packages using the common target. -binary-arch: build-arch install-arch +binary-arch: install-arch $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common binary: binary-arch binary-indep 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,15 @@ #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,8 +588,14 @@ 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;
