bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix squid compile, cleanup

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@13979 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2009-01-11 06:17:22 +00:00
parent 70ad04384e
commit 125d5f74b1
2 changed files with 56 additions and 36 deletions

72
net/squid/Makefile

@ -97,42 +97,42 @@ define Package/squid-mod-ntlm-auth-smb-auth
TITLE:=Samba NTLM authentication helper TITLE:=Samba NTLM authentication helper
endef endef
define Build/Configure CONFIGURE_ARGS += \
$(call Build/Configure/Default, \ --datadir=/usr/share/squid \
--datadir=/usr/share/squid \ --libexecdir=/usr/lib/squid \
--libexecdir=/usr/lib/squid \ --sysconfdir=/etc/squid \
--sysconfdir=/etc/squid \ --enable-shared \
--enable-shared \ --enable-static \
--enable-static \ --enable-x-accelerator-vary \
--enable-x-accelerator-vary \ --with-pthreads \
--with-pthreads \ --with-dl \
--with-dl \ --enable-icmp \
--enable-icmp \ --enable-kill-parent-hack \
--enable-kill-parent-hack \ --enable-arp-acl \
--enable-arp-acl \ --enable-ssl \
--enable-ssl \ --enable-htcp \
--enable-htcp \ --enable-err-languages=English \
--enable-err-languages=English \ --enable-default-err-language=English \
--enable-default-err-language=English \ --enable-linux-netfilter \
--enable-linux-netfilter \ --enable-icmp \
--enable-icmp \ --enable-external-acl-helpers="" \
--enable-external-acl-helpers="" \ --enable-underscores \
--enable-underscores \ --enable-cache-digests \
--enable-cache-digests \ --enable-referer-log \
--enable-referer-log \ --enable-delay-pools \
--enable-delay-pools \ --enable-useragent-log \
--enable-useragent-log \ --with-openssl=$(STAGING_DIR)/usr \
--with-openssl=$(STAGING_DIR)/usr \ --enable-auth="basic digest ntlm" \
--enable-auth="basic digest ntlm" \ --enable-basic-auth-helpers="getpwnam NCSA SMB" \
--enable-basic-auth-helpers="getpwnam NCSA SMB" \ --enable-ntlm-auth-helpers="fakeauth SMB" \
--enable-ntlm-auth-helpers="fakeauth SMB" \ --enable-digest-auth-helpers="password" \
--enable-digest-auth-helpers="password" \ --enable-external-acl-helpers="ip_user unix_group" \
--enable-external-acl-helpers="ip_user unix_group" \ --enable-epoll \
--enable-epoll \ --with-maxfd=4096 \
--with-maxfd=4096 \
)
endef
CONFIGURE_VARS += \
ac_cv_header_linux_netfilter_ipv4_h=yes \
define Build/Compile define Build/Compile
# pass INCLUDES to compile host sources against our OpenSSL, not the host one # pass INCLUDES to compile host sources against our OpenSSL, not the host one
$(MAKE) -C $(PKG_BUILD_DIR)/lib \ $(MAKE) -C $(PKG_BUILD_DIR)/lib \
@ -140,7 +140,7 @@ define Build/Compile
all all
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all install install
endef endef
define BuildPlugin define BuildPlugin

20
net/squid/patches/006-netfilter_missing_linux_types_h.patch Normal file

@ -0,0 +1,20 @@
--- a/src/client_side.c
+++ b/src/client_side.c
@@ -92,6 +92,7 @@
#endif
#if LINUX_NETFILTER
+#include <linux/types.h>
#include <linux/netfilter_ipv4.h>
#endif
--- a/src/forward.c
+++ b/src/forward.c
@@ -37,6 +37,7 @@
#include "squid.h"
#if LINUX_NETFILTER
+#include <linux/types.h>
#include <linux/netfilter_ipv4.h>
#endif
#if LINUX_TPROXY