Package: google-glog Version: 0.3.2-4 Followup-For: Bug #699444 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu raring ubuntu-patch
Dear Maintainer, In Ubuntu, the attached patch was applied to fix the signalhandler test failure on non-i386/-amd64 machines. Thanks for considering it. (it's also failing on armhf for us, and the upstream bug suggests the test only works on i386 and amd64: http://code.google.com/p/google-glog/issues/detail?id=140) -- System Information: Debian Release: wheezy/sid APT prefers raring-updates APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.8.0-11-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru google-glog-0.3.2/debian/changelog google-glog-0.3.2/debian/changelog diff -Nru google-glog-0.3.2/debian/patches/20120617_fix_test_on_ppc.diff google-glog-0.3.2/debian/patches/20120617_fix_test_on_ppc.diff --- google-glog-0.3.2/debian/patches/20120617_fix_test_on_ppc.diff 2012-10-13 08:37:04.000000000 -0400 +++ google-glog-0.3.2/debian/patches/20120617_fix_test_on_ppc.diff 1969-12-31 19:00:00.000000000 -0500 @@ -1,13 +0,0 @@ -Index: pkg-google-glog/src/signalhandler_unittest.sh -=================================================================== ---- pkg-google-glog.orig/src/signalhandler_unittest.sh 2012-06-17 21:48:33.000000000 +0900 -+++ pkg-google-glog/src/signalhandler_unittest.sh 2012-06-17 22:40:23.000000000 +0900 -@@ -67,7 +67,7 @@ - - # The PC cannot be obtained in signal handlers on PowerPC correctly. - # We just skip the test for PowerPC. --if [ x`uname -p` = x"powerpc" ]; then -+if [ x`uname -m` = x"ppc" ]; then - echo "PASS (We don't test the signal handler on PowerPC.)" - exit 0 - fi diff -Nru google-glog-0.3.2/debian/patches/20130313_fix_test_on_ports.diff google-glog-0.3.2/debian/patches/20130313_fix_test_on_ports.diff --- google-glog-0.3.2/debian/patches/20130313_fix_test_on_ports.diff 1969-12-31 19:00:00.000000000 -0500 +++ google-glog-0.3.2/debian/patches/20130313_fix_test_on_ports.diff 2013-03-13 14:07:14.000000000 -0400 @@ -0,0 +1,19 @@ +Index: google-glog-0.3.2/src/signalhandler_unittest.sh +=================================================================== +--- google-glog-0.3.2.orig/src/signalhandler_unittest.sh 2013-03-13 13:49:37.820188111 -0400 ++++ google-glog-0.3.2/src/signalhandler_unittest.sh 2013-03-13 14:07:11.980204520 -0400 +@@ -65,10 +65,10 @@ + exit 0 + fi + +-# The PC cannot be obtained in signal handlers on PowerPC correctly. +-# We just skip the test for PowerPC. +-if [ x`uname -p` = x"powerpc" ]; then +- echo "PASS (We don't test the signal handler on PowerPC.)" ++# This test only works correctly on i386 and amd64. ++# We just skip the test when not on those platforms. ++if [ x`uname -m` != x"x86_64" -a x`uname -m` != x"i686" ]; then ++ echo "PASS (We only test the signal handler on i386 or amd64.)" + exit 0 + fi + diff -Nru google-glog-0.3.2/debian/patches/series google-glog-0.3.2/debian/patches/series --- google-glog-0.3.2/debian/patches/series 2012-10-13 08:37:04.000000000 -0400 +++ google-glog-0.3.2/debian/patches/series 2013-03-13 13:49:13.000000000 -0400 @@ -1,3 +1,3 @@ 20120617_fix_for_hurd.diff -20120617_fix_test_on_ppc.diff 20120621_errnos.diff +20130313_fix_test_on_ports.diff
