summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-11-16 10:02:17 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-11-18 13:30:23 -0800
commitbfc284223728fee5e1a483c59802a9d719d8ddfb (patch)
treef351894e6a79b691dc68ca1463492f1d62933d4f
parent7d0a0f95e984d2cf5d47fcaaf4359463d1f49185 (diff)
downloadpoky-bfc284223728fee5e1a483c59802a9d719d8ddfb.tar.gz
libproxy: Upgraded to version 0.4.6
Remove the disable_Os_option.patch since the latest code doesn't use Os option. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-rw-r--r--meta/recipes-support/libproxy/libproxy-0.4.3/disable_Os_option.patch17
-rw-r--r--meta/recipes-support/libproxy/libproxy_0.4.6.bb (renamed from meta/recipes-support/libproxy/libproxy_0.4.3.bb)5
2 files changed, 2 insertions, 20 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
deleted file mode 100644
index cdf6ff6f52..0000000000
--- a/meta/recipes-support/libproxy/libproxy-0.4.3/disable_Os_option.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Do not set Os optimization in target APP CFLAGS, since it may have potential
2error if "--enable-target-optspace" is not set when configuring GCC.
3
4Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
5
6diff -ruN libproxy-0.4.3-orig/CMakeLists.txt libproxy-0.4.3/CMakeLists.txt
7--- libproxy-0.4.3-orig/CMakeLists.txt 2010-09-21 17:16:06.000000000 +0800
8+++ libproxy-0.4.3/CMakeLists.txt 2010-09-21 17:16:40.000000000 +0800
9@@ -61,7 +61,7 @@
10 add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
11 else()
12 add_definitions(-D_POSIX_C_SOURCE=1)
13- set(CMAKE_CXX_FLAGS "-g -Wall -Werror -fvisibility=hidden -Os ${CMAKE_CXX_FLAGS}")
14+ set(CMAKE_CXX_FLAGS "-g -Wall -Werror -fvisibility=hidden -O2 ${CMAKE_CXX_FLAGS}")
15 endif()
16
17 ### Subdirectories
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.3.bb b/meta/recipes-support/libproxy/libproxy_0.4.6.bb
index ffa06f636a..b317eb2793 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.3.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.6.bb
@@ -9,10 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
9 9
10DEPENDS = "virtual/libx11 xmu gconf-dbus" 10DEPENDS = "virtual/libx11 xmu gconf-dbus"
11 11
12SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \ 12SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
13 file://disable_Os_option.patch"
14 13
15PR = "r2" 14PR = "r0"
16 15
17inherit cmake pkgconfig 16inherit cmake pkgconfig
18 17