From bfc284223728fee5e1a483c59802a9d719d8ddfb Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Tue, 16 Nov 2010 10:02:17 +0800 Subject: 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 --- .../libproxy-0.4.3/disable_Os_option.patch | 17 -------------- meta/recipes-support/libproxy/libproxy_0.4.3.bb | 27 ---------------------- meta/recipes-support/libproxy/libproxy_0.4.6.bb | 26 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-support/libproxy/libproxy-0.4.3/disable_Os_option.patch delete mode 100644 meta/recipes-support/libproxy/libproxy_0.4.3.bb create mode 100644 meta/recipes-support/libproxy/libproxy_0.4.6.bb (limited to 'meta') 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 @@ -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 - -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 deleted file mode 100644 index ffa06f636a..0000000000 --- a/meta/recipes-support/libproxy/libproxy_0.4.3.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "A library that provides automatic proxy configuration management" -HOMEPAGE = "http://code.google.com/p/libproxy/" -BUGTRACKER = "http://code.google.com/p/libproxy/issues/list" -SECTION = "libs" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \ - file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" - - -DEPENDS = "virtual/libx11 xmu gconf-dbus" - -SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \ - file://disable_Os_option.patch" - -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/${PV}/plugins/" - -do_configure_prepend() { - export HOST_SYS=${HOST_SYS} - export BUILD_SYS=${BUILD_SYS} -} diff --git a/meta/recipes-support/libproxy/libproxy_0.4.6.bb b/meta/recipes-support/libproxy/libproxy_0.4.6.bb new file mode 100644 index 0000000000..b317eb2793 --- /dev/null +++ b/meta/recipes-support/libproxy/libproxy_0.4.6.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "A library that provides automatic proxy configuration management" +HOMEPAGE = "http://code.google.com/p/libproxy/" +BUGTRACKER = "http://code.google.com/p/libproxy/issues/list" +SECTION = "libs" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \ + file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" + + +DEPENDS = "virtual/libx11 xmu gconf-dbus" + +SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz" + +PR = "r0" + +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/${PV}/plugins/" + +do_configure_prepend() { + export HOST_SYS=${HOST_SYS} + export BUILD_SYS=${BUILD_SYS} +} -- cgit 1.2.3-korg