squid: apply patches for #2884

diff --git a/packages/squid/squid-native_2.6.STABLE14.bb b/packages/squid/squid-native_2.6.STABLE14.bb
new file mode 100644 (file)
index 0000000..0730bc1
--- /dev/null
+++ b/packages/squid/squid-native_2.6.STABLE14.bb
@@ -0,0 +1,11 @@
+inherit native autotools
+
+SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-$PV}.tar.bz2"
+S = "${WORKDIR}/squid-${PV}"
+
+inherit native autotools
+
+do_stage() {
+        install -d ${STAGING_BINDIR_NATIVE}   
+        install -m 0755 src/cf_gen ${STAGING_BINDIR_NATIVE}/cf_gen
+}

diff --git a/packages/squid/squid_2.6.STABLE14.bb b/packages/squid/squid_2.6.STABLE14.bb
index 580ec52..beef3ba 100644 (file)
--- a/packages/squid/squid_2.6.STABLE14.bb
+++ b/packages/squid/squid_2.6.STABLE14.bb
@@ -1,11 +1,23 @@
 DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"
 LICENSE = "GPLv2"
 
-DEPENDS = "aio"
+DEPENDS = "squid-native-${PV}"
 
-SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-2.6.STABLE14.tar.bz2"
+SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-${PV}.tar.bz2"
 
 inherit autotools
 
+EXTRA_OECONF = "--disable-epoll --disable-nls"
 
+do_configure_append() {
+   sed -i -e 's|./cf_gen |${STAGING_BINDIR_NATIVE}/cf_gen |g' src/Makefile
+}
 
+# this packages the languages better and saves some space, installs
+# English as errors default and the others in locale package
+
+FILES_${PN} += " ${datadir}/errors/English/* \
+                 ${datadir}/icons/* \
+                 ${datadir}/mib.txt"
+
+FILES_${PN}-locale += " ${datadir}/errors/* "