summaryrefslogtreecommitdiff
path: root/package/squid
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-09-14 19:04:46 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-09-14 19:04:46 +0200
commit05d0076d97ed69a531df1aa5cde3a1e6ed17f922 (patch)
treee605e2d5de96fe9afe7ad8724fe57e9e5c5417e1 /package/squid
parenta2e96ddb9519a2f40857f11501b88e465d25082d (diff)
replace mksh scripts with faster C programs
depmaker and pkgmaker is replaced by C programs. scan-pkgs.sh will be replaced by another mechanism. scan-pkgs.sh is needed to recognize package flavour changes, so that a package is rebuild. Generation of meta-data is a lot faster now. Fix or add new PKG variables to fulfill the needs of the new programs. Documentation will follow as soon as it is stable.
Diffstat (limited to 'package/squid')
-rw-r--r--package/squid/Makefile22
1 files changed, 6 insertions, 16 deletions
diff --git a/package/squid/Makefile b/package/squid/Makefile
index 109e2ce95..29b038734 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -10,12 +10,15 @@ PKG_MD5SUM:= c70ef1198e6a6c1ae80bc57cd3592e36
PKG_DESCR:= squid web and cache proxy
PKG_SECTION:= proxy
PKG_DEPENDS:= libopenssl libpthread
-PKG_BUILDDEP+= openssl
-PKG_URL:= http://www.squid-cache.org
+PKG_BUILDDEP:= openssl
+PKG_URL:= http://www.squid-cache.org/
PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.1/
PKG_MULTI:= 1
-#PKG_CXX:= SQUID
+PKG_SUBPKGS:= SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA
+PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_PASSWORD
+PKG_SUBPKGS+= SQUID_MOD_EXTERNAL_ACL_IP_USER SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP
+PKG_SUBPKGS+= SQUID_MOD_NTLM_AUTH_FAKEAUTH
PKG_HOST_DEPENDS:= !netbsd !cygwin
AUTH_MODULES:= basic digest ntlm
@@ -72,12 +75,6 @@ $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth))
$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_group))
$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth))
-#ifeq ($(ADK_COMPILE_SQUID_WITH_UCLIBCXX),y)
-#CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \
-# -I${STAGING_DIR}/usr/include/uClibc++" \
-# LIBS="-nodefaultlibs -luClibc++ -ldl -lm"
-#endif
-
CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \
ac_cv_sizeof_short=2 \
ac_cv_sizeof_int=4 \
@@ -135,13 +132,6 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \
--enable-digest-auth-helpers="${DIGEST_AUTH_HELPERS}" \
--enable-external-acl-helpers="${EXTERNAL_ACL_HELPERS}"
-#ifeq (${ADK_COMPILE_SQUID_WITH_UCLIBCXX},y)
-# add workaround because libtool tries to link libstdc++
-#post-configure:
-# ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \
-# ${WRKBUILD}/libtool
-#endif
-
post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
${INSTALL_DIR} ${IDIR_SQUID}/etc/squid
${INSTALL_DATA} ${WRKINST}/etc/squid/mime.conf \