5 files changed, 52 insertions, 28 deletions
diff --git a/recipes/squid/squid-native.inc b/recipes/squid/squid-native.inc
deleted file mode 100644
index 1077b98461..0000000000
--- a/recipes/squid/squid-native.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-inherit native autotools
-
-SRC_URI = "http://www.squid-cache.org/Versions/v2/${SQUID_MAJOR}/squid-${PV}.tar.bz2;name=squid-${PV}"
-S = "${WORKDIR}/squid-${PV}"
-
-do_stage() {
-        install -d ${STAGING_BINDIR_NATIVE}   
-        install -m 0755 src/cf_gen ${STAGING_BINDIR_NATIVE}/cf_gen
-}
diff --git a/recipes/squid/squid-native_2.6.STABLE14.bb b/recipes/squid/squid-native_2.6.STABLE14.bb
deleted file mode 100644
index ea78bc4998..0000000000
--- a/recipes/squid/squid-native_2.6.STABLE14.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SQUID_MAJOR = "2.6"
-
-include squid-native.inc
-
-SRC_URI[squid-2.6.STABLE14.md5sum] = "eadb138d48320df8b99349121159c6bf"
-SRC_URI[squid-2.6.STABLE14.sha256sum] = "dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a"
diff --git a/recipes/squid/squid-native_2.7.STABLE8.bb b/recipes/squid/squid-native_2.7.STABLE8.bb
deleted file mode 100644
index e685cda595..0000000000
--- a/recipes/squid/squid-native_2.7.STABLE8.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SQUID_MAJOR = "2.7"
-
-include squid-native.inc
-
-SRC_URI[squid-2.7.STABLE8.md5sum] = "c061ba1c9ae39d0aaa8eca137f7dd18b"
-SRC_URI[squid-2.7.STABLE8.sha256sum] = "9409b02fc53518e334395df803a1ae30f4ed385b0f041fb310b4c75e2a49138c"
diff --git a/recipes/squid/squid.inc b/recipes/squid/squid.inc
index 49d084f628..a392ccd5e4 100644
--- a/recipes/squid/squid.inc
+++ b/recipes/squid/squid.inc
@@ -1,10 +1,11 @@
 DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"
 LICENSE = "GPLv2"
-INC_PR = "r7"
-DEPENDS = "squid-native-${PV} openssl openldap"
+INC_PR = "r8"
+DEPENDS = "openssl openssl-native openldap"
 
 SRC_URI = "http://www.squid-cache.org/Versions/v2/${SQUID_MAJOR}/squid-${PV}.tar.bz2;name=squid-${PV} \
            file://fix_epoll_check.patch \
+	   file://squidv2-build-cf_gen.patch \
            file://squid.init \
 	   file://squid-volatiles \
 	   "
@@ -27,10 +28,6 @@ EXTRA_OEMAKE = "\
 
 INITSCRIPT_NAME = "squid"
 
-do_configure_append() {
-   sed -i -e 's|./cf_gen |${STAGING_BINDIR_NATIVE}/cf_gen |g' src/Makefile
-}
-
 do_install_prepend() {
 	install -d ${D}${sysconfdir}/squid
 }
@@ -56,4 +53,4 @@ FILES_${PN} += " ${datadir}/errors/English/* \
                  ${datadir}/mib.txt"
 
 FILES_${PN}-locale += " ${datadir}/errors/* " 
-FILES_${PN}-auth-ldap = "${libexecdir}/digest_ldap_auth ${libexecdir}/squid_ldap_auth"
-\ No newline at end of file
+FILES_${PN}-auth-ldap = "${libexecdir}/digest_ldap_auth ${libexecdir}/squid_ldap_auth"
diff --git a/recipes/squid/squid/squidv2-build-cf_gen.patch b/recipes/squid/squid/squidv2-build-cf_gen.patch
new file mode 100644
index 0000000000..0326f2cf5a
--- /dev/null
+++ b/recipes/squid/squid/squidv2-build-cf_gen.patch
@@ -0,0 +1,48 @@
+Index: squid-2.7.STABLE8/configure.in
+===================================================================
+--- squid-2.7.STABLE8.orig/configure.in	2010-07-06 13:53:58.000000000 +0400
++++ squid-2.7.STABLE8/configure.in	2010-07-06 14:17:39.000000000 +0400
+@@ -27,6 +27,17 @@
+ AM_PROG_CC_C_O
+ AC_CANONICAL_HOST
+ 
++dnl Define BUILD_CC
++BUILD_CC="$BUILD_CC"
++AC_SUBST(BUILD_CC)
++
++dnl Define BUILD_CFLAGS
++BUILD_CFLAGS="$BUILD_CFLAGS"
++AC_SUBST(BUILD_CFLAGS)
++
++dnl Define BUILD_LDFLAGS
++BUILD_LDFLAGS="$BUILD_LDFLAGS"
++AC_SUBST(BUILD_LDFLAGS)
+ 
+ CRYPTLIB=''
+ REGEXLIB=''	# -lregex
+Index: squid-2.7.STABLE8/src/Makefile.am
+===================================================================
+--- squid-2.7.STABLE8.orig/src/Makefile.am	2010-07-06 13:44:14.000000000 +0400
++++ squid-2.7.STABLE8/src/Makefile.am	2010-07-06 14:40:53.000000000 +0400
+@@ -115,11 +115,20 @@
+ 	$(UNLINKD) \
+ 	$(LOGFILED)
+ 
+-cf_gen_SOURCES = cf_gen.c defines.h debug.c
++cf_gen_SOURCES = cf_gen.c defines.h
+ nodist_cf_gen_SOURCES = globals.c
+ nodist_cf_gen_HEADER = cf_gen_defines.h
+ cf_gen.$(OBJEXT): cf_gen_defines.h
+ 
++BUILD_CC ?= @BUILD_CC@
++BUILD_CFLAGS ?= @BUILD_CFLAGS@
++BUILD_LDFLAGS ?= @BUILD_LDFLAGS@
++
++cf_gen$(EXEEXT): $(nodist_cf_gen_SOURCES) $(nodist_cf_gen_HEADER) $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -lm -o $@ $(srcdir)/cf_gen.c \
++		$(srcdir)/globals.c $(srcdir)/debug.c $(top_srcdir)/lib/util.c -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" \
++		${INCLUDES}
++
+ EXTRA_squid_SOURCES = \
+ 	delay_pools.c \
+ 	dns.c \