[Python-modules-commits] r13037 - in packages/shiboken/trunk/debian (3 files)

[odyx-guest at users.alioth.debian.org]

    Date: Thursday, May 20, 2010 @ 14:22:26
  Author: odyx-guest
Revision: 13037

Add ftbfs_mips.patch

Added:
  packages/shiboken/trunk/debian/patches/ftbfs_mips.patch
Modified:
  packages/shiboken/trunk/debian/changelog
  packages/shiboken/trunk/debian/patches/series

Modified: packages/shiboken/trunk/debian/changelog
===================================================================
--- packages/shiboken/trunk/debian/changelog	2010-05-20 13:08:37 UTC (rev 13036)
+++ packages/shiboken/trunk/debian/changelog	2010-05-20 14:22:26 UTC (rev 13037)
@@ -2,8 +2,11 @@
 
   * shiboken depends on generatorrunner (Closes: #581215)
 
- -- Didier Raboud <didier at raboud.com>  Tue, 11 May 2010 20:33:58 +0200
+  * Fix FTBFSes on mips{,el} by adding ftbfs_mips.patch
+    - Uses hash-style=both on all arches.
 
+ -- Didier Raboud <didier at raboud.com>  Thu, 20 May 2010 16:08:23 +0200
+
 shiboken (0.3.1-1) unstable; urgency=low
 
   * New 0.3.1 upstream release

Added: packages/shiboken/trunk/debian/patches/ftbfs_mips.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/ftbfs_mips.patch	                        (rev 0)
+++ packages/shiboken/trunk/debian/patches/ftbfs_mips.patch	2010-05-20 14:22:26 UTC (rev 13037)
@@ -0,0 +1,18 @@
+Description: Fix FTBFS on MIPS/MIPSEL by forcing hash-style to both for all arches
+Author: Didier Raboud <didier at raboud.com>
+Origin: vendor
+Forwarded: not yet
+Last-Updated: 2010-05-20
+Index: shiboken/CMakeLists.txt
+===================================================================
+--- shiboken.orig/CMakeLists.txt	2010-05-20 15:55:29.000000000 +0200
++++ shiboken/CMakeLists.txt	2010-05-20 16:00:28.000000000 +0200
+@@ -21,7 +21,7 @@
+     set(CMAKE_CXX_FLAGS "/DWIN32 /D_WINDOWS /w /EHsc- /GS- /GR- /DLIBSHIBOKEN_BUILD -D_SCL_SECURE_NO_WARNINGS")
+ else()
+     if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+-        set(CMAKE_CXX_FLAGS "-Wall -Wno-strict-aliasing -DNDEBUG -O2 -Wl,-O1 -Wl,--hash-style=gnu -fvisibility=hidden")
++        set(CMAKE_CXX_FLAGS "-Wall -Wno-strict-aliasing -DNDEBUG -O2 -Wl,-O1 -Wl,--hash-style=both -fvisibility=hidden")
+     else()
+         set(CMAKE_CXX_FLAGS "-g -Wall -Wno-strict-aliasing -fvisibility=hidden")
+     endif()

Modified: packages/shiboken/trunk/debian/patches/series
===================================================================
--- packages/shiboken/trunk/debian/patches/series	2010-05-20 13:08:37 UTC (rev 13036)
+++ packages/shiboken/trunk/debian/patches/series	2010-05-20 14:22:26 UTC (rev 13037)
@@ -1,2 +1,3 @@
 use_original_sparsehash.patch
 fix_tests.patch
+ftbfs_mips.patch