diff options
| -rw-r--r-- | meta/packages/libproxy/libproxy/asneededfix.patch | 13 | ||||
| -rw-r--r-- | meta/packages/libproxy/libproxy_0.4.2.bb (renamed from meta/packages/libproxy/libproxy_0.2.3.bb) | 19 |
2 files changed, 13 insertions, 19 deletions
diff --git a/meta/packages/libproxy/libproxy/asneededfix.patch b/meta/packages/libproxy/libproxy/asneededfix.patch deleted file mode 100644 index cc22077f07..0000000000 --- a/meta/packages/libproxy/libproxy/asneededfix.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | Index: libproxy-0.2.3/src/lib/Makefile.am | ||
| 2 | =================================================================== | ||
| 3 | --- libproxy-0.2.3.orig/src/lib/Makefile.am 2009-03-09 16:24:08.000000000 +0000 | ||
| 4 | +++ libproxy-0.2.3/src/lib/Makefile.am 2009-03-09 16:24:13.000000000 +0000 | ||
| 5 | @@ -2,7 +2,7 @@ | ||
| 6 | libproxy_la_SOURCES = misc.c url.c pac.c dhcp.c dns.c slp.c wpad.c proxy_factory.c config_file.c \ | ||
| 7 | misc.h url.h pac.h dhcp.h dns.h slp.h wpad.h proxy_factory.h proxy.h config_file.h | ||
| 8 | libproxy_la_CFLAGS = -Wall | ||
| 9 | -libproxy_la_LDFLAGS = -lm | ||
| 10 | +libproxy_la_LDFLAGS = -lm -ldl | ||
| 11 | |||
| 12 | include_HEADERS = proxy.h | ||
| 13 | |||
diff --git a/meta/packages/libproxy/libproxy_0.2.3.bb b/meta/packages/libproxy/libproxy_0.4.2.bb index 8c5ca42ab8..61595f64e9 100644 --- a/meta/packages/libproxy/libproxy_0.2.3.bb +++ b/meta/packages/libproxy/libproxy_0.4.2.bb | |||
| @@ -1,18 +1,25 @@ | |||
| 1 | DESCRIPTION = "A library that provides automatic proxy configuration management" | 1 | DESCRIPTION = "A library that provides automatic proxy configuration management" |
| 2 | HOMEPAGE = "http://code.google.com/p/libproxy/" | 2 | HOMEPAGE = "http://code.google.com/p/libproxy/" |
| 3 | BUGTRACKER = "http://code.google.com/p/libproxy/issues/list" | 3 | BUGTRACKER = "http://code.google.com/p/libproxy/issues/list" |
| 4 | SECTION = "libs" | ||
| 4 | LICENSE = "LGPLv2.1+" | 5 | LICENSE = "LGPLv2.1+" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \ | ||
| 7 | file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" | ||
| 5 | 8 | ||
| 6 | SECTION = "libs" | ||
| 7 | 9 | ||
| 8 | DEPENDS = "virtual/libx11 xmu gconf-dbus" | 10 | DEPENDS = "virtual/libx11 xmu gconf-dbus" |
| 9 | 11 | ||
| 10 | SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \ | 12 | SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz" |
| 11 | file://asneededfix.patch;patch=1" | ||
| 12 | S = "${WORKDIR}/libproxy-${PV}" | ||
| 13 | 13 | ||
| 14 | inherit autotools pkgconfig | 14 | PR = "r0" |
| 15 | |||
| 16 | inherit cmake pkgconfig | ||
| 15 | 17 | ||
| 16 | EXTRA_OECONF = "--without-kde --with-gnome --without-webkit --without-python --without-mozjs --without-networkmanager" | 18 | EXTRA_OECONF = "--without-kde --with-gnome --without-webkit --without-python --without-mozjs --without-networkmanager" |
| 17 | 19 | ||
| 18 | FILES_${PN}-dbg += "${libdir}/libproxy/0.2.3/plugins/" | 20 | FILES_${PN}-dbg += "${libdir}/libproxy/0.4.2/plugins/" |
| 21 | |||
| 22 | do_configure_prepend() { | ||
| 23 | export HOST_SYS=${HOST_SYS} | ||
| 24 | export BUILD_SYS=${BUILD_SYS} | ||
| 25 | } | ||
