[Pkg-voip-commits] r3360 - in wengophone/trunk/debian: . patches patches/debian

[Marco Nenciarini]

Author: mnencia
Date: 2007-04-03 19:40:54 +0000 (Tue, 03 Apr 2007)
New Revision: 3360

Added:
   wengophone/trunk/debian/patches/debian/cmake-force-fpic.patch
Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/patches/series
Log:
One more forgotten patch... I hope this is the last mistake


Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2007-04-03 16:52:42 UTC (rev 3359)
+++ wengophone/trunk/debian/changelog	2007-04-03 19:40:54 UTC (rev 3360)
@@ -8,11 +8,12 @@
   * Added patches
     + cmake-no-rpath_to_link_path
     + remove-extra-copying-file
+    + cmake-force-fpic
   * debian/control: Build-depends on g++-3.4
-  * Modified get-orig-source.sh to better handle the new source 
+  * Modified get-orig-source.sh to better handle the new source
     structure.
 
- -- Marco Nenciarini <mnencia at mercurio.math.unifi.it>  Tue,  3 Apr 2007 17:23:11 +0200
+ -- Marco Nenciarini <mnencia at debian.org>  Tue, 03 Apr 2007 21:42:13 +0200
 
 wengophone (2.1.0~beta1-svn9983-1) UNRELEASED; urgency=low
 

Added: wengophone/trunk/debian/patches/debian/cmake-force-fpic.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/cmake-force-fpic.patch	2007-04-03 16:52:42 UTC (rev 3359)
+++ wengophone/trunk/debian/patches/debian/cmake-force-fpic.patch	2007-04-03 19:40:54 UTC (rev 3360)
@@ -0,0 +1,21 @@
+Index: wengophone-2.1.0~rc2-svn10386/owbuild/owbuild/OWDefaultCompilerFlags.cmake
+===================================================================
+--- wengophone-2.1.0~rc2-svn10386.orig/owbuild/owbuild/OWDefaultCompilerFlags.cmake	2007-04-03 14:54:16.000000000 +0000
++++ wengophone-2.1.0~rc2-svn10386/owbuild/owbuild/OWDefaultCompilerFlags.cmake	2007-04-03 14:54:34.000000000 +0000
+@@ -15,12 +15,10 @@
+ 
+ # With -fPIC
+ if (UNIX AND NOT WIN32)
+-	if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+-		ow_check_cxx_compiler_flag("-fPIC" WITH_FPIC)
+-		if (WITH_FPIC)
+-			add_definitions(-fPIC)
+-		endif (WITH_FPIC)
+-	endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
++	ow_check_cxx_compiler_flag("-fPIC" WITH_FPIC)
++	if (WITH_FPIC)
++		add_definitions(-fPIC)
++	endif (WITH_FPIC)
+ 
+ 	if (GCC4)
+ 		# See http://www.cynapses.org/tmp/gcc/fortify_source

Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series	2007-04-03 16:52:42 UTC (rev 3359)
+++ wengophone/trunk/debian/patches/series	2007-04-03 19:40:54 UTC (rev 3360)
@@ -2,3 +2,4 @@
 debian/disable-ilbc.patch
 debian/remove-extra-copying-file.patch
 debian/cmake-no-rpath_to_link_path.patch
+debian/cmake-force-fpic.patch