[Pkg-mysql-commits] r2054 - in mysql-5.5/branches/experimental/debian: . patches

[Nicholas Bamber]

tags 651002 pending
thanks

Author: periapt
Date: 2012-03-18 21:52:55 +0000 (Sun, 18 Mar 2012)
New Revision: 2054

Added:
   mysql-5.5/branches/experimental/debian/patches/1_hurd.patch
Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/patches/series
   mysql-5.5/branches/experimental/debian/rules
Log:
Added patch to provide cmake options for GNU/Hurd (Closes: #651002)
and tweaked debian/rules so that only 'make test' is run on Hurd.

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2012-03-16 18:48:33 UTC (rev 2053)
+++ mysql-5.5/branches/experimental/debian/changelog	2012-03-18 21:52:55 UTC (rev 2054)
@@ -42,6 +42,8 @@
   * Added myself to Uploaders
   * Added libssl-dev as a build dependency and patched main.openssl_1 test
     so that it works with that library (Closes: #660799)
+  * Added patch to provide cmake options for GNU/Hurd (Closes: #651002)
+    and tweaked debian/rules so that only 'make test' is run on Hurd.
 
  -- Clint Byrum <clint at ubuntu.com>  Tue, 14 Feb 2012 11:48:47 -0800
 

Added: mysql-5.5/branches/experimental/debian/patches/1_hurd.patch
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/1_hurd.patch	                        (rev 0)
+++ mysql-5.5/branches/experimental/debian/patches/1_hurd.patch	2012-03-18 21:52:55 UTC (rev 2054)
@@ -0,0 +1,41 @@
+Author: Pino Toscano <pino at debian.org>
+Subject: cmake options for GNU/Hurd
+Bug: http://bugs.mysql.com/bug.php?id=64685
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651002
+Last-Update: 2012-03-18
+Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
+--- /dev/null
++++ b/cmake/os/GNU.cmake
+@@ -0,0 +1,20 @@
++# This file includes GNU/Hurd specific options and quirks, related to system checks
++
++INCLUDE(CheckSymbolExists)
++
++SET(_GNU_SOURCE 1)
++
++# Fix CMake (< 2.8) flags. -rdynamic exports too many symbols.
++FOREACH(LANG C CXX)
++  STRING(REPLACE "-rdynamic" ""
++  CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS
++  "${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}"
++  )
++ENDFOREACH()
++
++# Ensure we have clean build for shared libraries
++# without unresolved symbols
++SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined")
++
++# 64 bit file offset support flag
++SET(_FILE_OFFSET_BITS 64)
+--- a/mysql-test/lib/My/Platform.pm
++++ b/mysql-test/lib/My/Platform.pm
+@@ -110,6 +110,9 @@
+   # This may not be true, but we can't test for it on AIX due to Perl bug
+   # See Bug #45771
+   return 0 if ($^O eq 'aix');
++  # Similarly the path length is hidden.
++  # See Debian bug #651002
++  return 0 if ($^O eq 'gnu');
+ 
+   require IO::Socket::UNIX;
+ 

Modified: mysql-5.5/branches/experimental/debian/patches/series
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/series	2012-03-16 18:48:33 UTC (rev 2053)
+++ mysql-5.5/branches/experimental/debian/patches/series	2012-03-18 21:52:55 UTC (rev 2054)
@@ -1,3 +1,4 @@
+1_hurd.patch
 2_main_openssl_1.patch
 38_scripts__mysqld_safe.sh__signals.patch
 62_disable_tests.patch

Modified: mysql-5.5/branches/experimental/debian/rules
===================================================================
--- mysql-5.5/branches/experimental/debian/rules	2012-03-16 18:48:33 UTC (rev 2053)
+++ mysql-5.5/branches/experimental/debian/rules	2012-03-18 21:52:55 UTC (rev 2054)
@@ -38,6 +38,11 @@
 # before a release, but it is long
     MAKE_TEST_TARGET=test-bt
 endif
+ifeq ($(ARCH_OS),hurd)
+# Tests not fully working under Hurd
+# See http://bugs.mysql.com/bug.php?id=64685
+    MAKE_TEST_TARGET=test
+endif
 
 USE_ASSEMBLER=--enable-assembler