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

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

    Date: Friday, May 28, 2010 @ 11:40:39
  Author: odyx-guest
Revision: 13118

Release shiboken 0.3.1-3

Modified:
  packages/shiboken/trunk/debian/changelog
  packages/shiboken/trunk/debian/patches/debian_buildoptions.patch
  packages/shiboken/trunk/debian/rules

Modified: packages/shiboken/trunk/debian/changelog
===================================================================
--- packages/shiboken/trunk/debian/changelog	2010-05-28 09:44:26 UTC (rev 13117)
+++ packages/shiboken/trunk/debian/changelog	2010-05-28 11:40:39 UTC (rev 13118)
@@ -1,10 +1,11 @@
 shiboken (0.3.1-3) unstable; urgency=low
 
-  * Use the new dpkg-buildflags to push standard compilation options.
+  * Patch upstream CMakeLists.txt to use the provided buildflags
     - Drop ftbfs_mips.patch
     - Add debian_buildoptions.patch
+    This should fix the mips{,el} FTBFSes.
 
- -- Didier Raboud <didier at raboud.com>  Fri, 28 May 2010 11:32:09 +0200
+ -- Didier Raboud <didier at raboud.com>  Fri, 28 May 2010 13:16:16 +0200
 
 shiboken (0.3.1-2) unstable; urgency=low
 

Modified: packages/shiboken/trunk/debian/patches/debian_buildoptions.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/debian_buildoptions.patch	2010-05-28 09:44:26 UTC (rev 13117)
+++ packages/shiboken/trunk/debian/patches/debian_buildoptions.patch	2010-05-28 11:40:39 UTC (rev 13118)
@@ -1,4 +1,5 @@
-Description: Allow pushing custom build options (see debian/rules)
+Description: Allow pushing custom build options
+ Also remove linker-specific options.
 Author: Didier Raboud <didier at raboud.com>
 Origin: vendor
 Forwarded: not needed (distributor customization)
@@ -6,32 +7,16 @@
 Index: shiboken/CMakeLists.txt
 ===================================================================
 --- shiboken.orig/CMakeLists.txt	2010-05-28 08:54:14.000000000 +0200
-+++ shiboken/CMakeLists.txt	2010-05-28 11:40:34.000000000 +0200
-@@ -17,15 +17,21 @@
-     set(CMAKE_BUILD_TYPE "Debug")
- endif()
- 
--if (MSVC)
--    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")
++++ shiboken/CMakeLists.txt	2010-05-28 13:15:39.000000000 +0200
+@@ -21,9 +21,9 @@
+     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")
-+if (NOT CMAKE_CXX_FLAGS)
-+    message("Debian: No CMAKE_CXX_FLAGS provided. Setting CMAKE_CXX_FLAGS defaults")
-+    if (MSVC)
-+        set(CMAKE_CXX_FLAGS "/DWIN32 /D_WINDOWS /w /EHsc- /GS- /GR- /DLIBSHIBOKEN_BUILD -D_SCL_SECURE_NO_WARNINGS")
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-strict-aliasing -DNDEBUG -fvisibility=hidden")
      else()
 -        set(CMAKE_CXX_FLAGS "-g -Wall -Wno-strict-aliasing -fvisibility=hidden")
-+        if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
-+            set(CMAKE_CXX_FLAGS "-Wall -Wno-strict-aliasing -DNDEBUG -O2 -Wl,-O1 -Wl,--hash-style=gnu -fvisibility=hidden")
-+        else()
-+            set(CMAKE_CXX_FLAGS "-g -Wall -Wno-strict-aliasing -fvisibility=hidden")
-+        endif()
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wno-strict-aliasing -fvisibility=hidden")
      endif()
-+else()
-+    message("Debian: CMAKE_CXX_FLAGS provided. Using those: '${CMAKE_CXX_FLAGS}'")
  endif()
-+
  if (WIN32 OR AVOID_PROTECTED_HACK)
-     message(STATUS "Avoiding protected hack!")
-     add_definitions("-DAVOID_PROTECTED_HACK")

Modified: packages/shiboken/trunk/debian/rules
===================================================================
--- packages/shiboken/trunk/debian/rules	2010-05-28 09:44:26 UTC (rev 13117)
+++ packages/shiboken/trunk/debian/rules	2010-05-28 11:40:39 UTC (rev 13118)
@@ -7,15 +7,6 @@
 PYVERSIONS=$(shell pyversions -v -r)
 DEFAULT_PY=$(shell pyversions -v -d)
 
-# Get distro defaults
-COMMON_CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) # Normally: -g -O2
-COMMON_LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)  Â # Normally: <empty>
-
-# Push package customisations
-COMMON_CXXFLAGS += -Wall -Wno-strict-aliasing -fvisibility=hidden
-CXXFLAGS = ${COMMON_CXXFLAGS} -DNDEBUG ${COMMON_LDFLAGS}
-DEBUG_CXXFLAGS = ${COMMON_CXXFLAGS} ${COMMON_LDFLAGS}
-
 #### CONFIGURE ####
 
 override_dh_auto_configure: $(PYVERSIONS:%=override_dh_auto_configure-%)
@@ -24,7 +15,6 @@
 	mkdir -p build-$*-dbg
 	dh_auto_configure --builddirectory=build-$*-dbg -- \
 	-DCMAKE_BUILD_TYPE:STRING="Debug" \
-	-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
 	-DCMAKE_SKIP_RPATH=true \
 	-DCMAKE_MODULE_PATH="$(shell pwd)/debian/cmake" \
 	-DCMAKE_PYTHON_VERSION="$*-dbg;$*" \
@@ -35,7 +25,6 @@
 	mkdir -p build-$*
 	dh_auto_configure --builddirectory=build-$* -- \
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
-	-DCMAKE_CXX_FLAGS="${DEBUG_CXXFLAGS}" \
 	-DCMAKE_SKIP_RPATH=true \
 	-DCMAKE_MODULE_PATH="$(shell pwd)/debian/cmake" \
 	-DCMAKE_PYTHON_VERSION=$* \
@@ -45,14 +34,14 @@
 #### BUILD ####
 
 override_dh_auto_build: $(PYVERSIONS:%=override_dh_auto_build-%)
+	# Build docs
+	cd doc; make html
 
 override_dh_auto_build_dbg-%:
 	dh_auto_build --builddirectory=build-$*-dbg
 
 override_dh_auto_build-%:
 	dh_auto_build --builddirectory=build-$*
-	# Build docs
-	cd doc; make html
 
 override_dh_compress:
 	dh_compress -X.js