gcc: enable poison parameters detection

If not configured with --enable-target-optspace, gcc will report
errors if there is '-Os' optimization in parameters.

This fixes [BUGID #342]

Also add "--enable-target-optspace" option to arm gcc configuration.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>

2 files changed, 21 insertions, 3 deletions

diff --git a/meta/recipes-support/libproxy/libproxy-0.4.3/disable_Os_option.patch b/meta/recipes-support/libproxy/libproxy-0.4.3/disable_Os_option.patch
new file mode 100644
index 0000000000..cdf6ff6f52
--- /dev/null
+++ b/meta/recipes-support/libproxy/libproxy-0.4.3/disable_Os_option.patch
@@ -0,0 +1,17 @@
+Do not set Os optimization in target APP CFLAGS, since it may have potential
+error if "--enable-target-optspace" is not set when configuring GCC.
+
+Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+
+diff -ruN libproxy-0.4.3-orig/CMakeLists.txt libproxy-0.4.3/CMakeLists.txt
+--- libproxy-0.4.3-orig/CMakeLists.txt  2010-09-21 17:16:06.000000000 +0800
++++ libproxy-0.4.3/CMakeLists.txt       2010-09-21 17:16:40.000000000 +0800
+@@ -61,7 +61,7 @@
+   add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
+ else()
+   add_definitions(-D_POSIX_C_SOURCE=1)
+-  set(CMAKE_CXX_FLAGS "-g -Wall -Werror -fvisibility=hidden -Os ${CMAKE_CXX_FLAGS}")
++  set(CMAKE_CXX_FLAGS "-g -Wall -Werror -fvisibility=hidden -O2 ${CMAKE_CXX_FLAGS}")
+ endif()
+ 
+ ### Subdirectories
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.3.bb b/meta/recipes-support/libproxy/libproxy_0.4.3.bb
index 6c0b7a50c6..ffa06f636a 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.3.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.3.bb
@@ -9,16 +9,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
 
 DEPENDS = "virtual/libx11 xmu gconf-dbus"
 
-SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
+SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \
+           file://disable_Os_option.patch"
 
-PR = "r1"
+PR = "r2"
 
 inherit cmake pkgconfig
 
 EXTRA_OECMAKE = "-DWITH_WEBKIT=no -DWITH_GNOME=yes -DWITH_KDE4=no \
               -DWITH_PYTHON=no -DWITH_PERL=no -DWITH_MOZJS=no -DWITH_NM=no"
 
-FILES_${PN}-dbg += "${libdir}/libproxy/0.4.2/plugins/"
+FILES_${PN}-dbg += "${libdir}/libproxy/${PV}/plugins/"
 
 do_configure_prepend() {
         export HOST_SYS=${HOST_SYS}