[Python-modules-commits] r13167 - in packages/pyside/trunk/debian (3 files)

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

    Date: Sunday, May 30, 2010 @ 17:37:55
  Author: odyx-guest
Revision: 13167

Add disableGccOptimizations.patch to make sure we get the
correct options (this should fix the mips{,el} FTBFS).

Added:
  packages/pyside/trunk/debian/patches/disableGccOptimizations.patch
Modified:
  packages/pyside/trunk/debian/changelog
  packages/pyside/trunk/debian/patches/series

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2010-05-30 17:25:28 UTC (rev 13166)
+++ packages/pyside/trunk/debian/changelog	2010-05-30 17:37:55 UTC (rev 13167)
@@ -2,10 +2,12 @@
 
   * Patches:
     - Re-order the series (upstream's, then Debian's)
+    - Add disableGccOptimizations.patch to make sure we get the
+      correct options (this should fix the mips{,el} FTBFS).
   
   * Override lintian warnings for the -dbg package.
 
- -- Didier Raboud <didier at raboud.com>  Sun, 30 May 2010 19:24:14 +0200
+ -- Didier Raboud <didier at raboud.com>  Sun, 30 May 2010 19:37:03 +0200
 
 pyside (0.3.1-2) unstable; urgency=low
 

Added: packages/pyside/trunk/debian/patches/disableGccOptimizations.patch
===================================================================
--- packages/pyside/trunk/debian/patches/disableGccOptimizations.patch	                        (rev 0)
+++ packages/pyside/trunk/debian/patches/disableGccOptimizations.patch	2010-05-30 17:37:55 UTC (rev 13167)
@@ -0,0 +1,25 @@
+Description: Allow pushing custom build options
+ Also remove linker-specific options.
+ This patch is more-or-less already upstream with 
+ http://qt.gitorious.org/pyside/pyside-shiboken/commit/0eb416d487ae381a78fe99498a5217e9f24d7413
+Author: Didier Raboud <didier at raboud.com>
+Origin: vendor
+Forwarded: not needed (distributor customization)
+Last-Update: 2010-05-30
+Index: pyside/CMakeLists.txt
+===================================================================
+--- pyside.orig/CMakeLists.txt	2010-05-30 19:30:16.000000000 +0200
++++ pyside/CMakeLists.txt	2010-05-30 19:34:50.000000000 +0200
+@@ -4,8 +4,10 @@
+ 
+ cmake_minimum_required(VERSION 2.6)
+ 
+-set(CMAKE_CXX_FLAGS_RELEASE "-Wall -DNDEBUG -Os -Wl,-O1 -Wl,--hash-style=gnu -Wno-strict-aliasing -fvisibility=hidden")
+-set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-common -Wall -fno-strict-aliasing -fvisibility=hidden")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden")
++
++set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
++set(CMAKE_CXX_FLAGS_DEBUG "-g")
+ 
+ if (NOT CMAKE_BUILD_TYPE)
+     set(CMAKE_BUILD_TYPE Release)

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2010-05-30 17:25:28 UTC (rev 13166)
+++ packages/pyside/trunk/debian/patches/series	2010-05-30 17:37:55 UTC (rev 13167)
@@ -4,3 +4,4 @@
 u_fixLinking_4326368.patch
 libPythonVersionPostfix.patch
 fixTests.patch
+disableGccOptimizations.patch