diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-27 23:09:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-27 23:09:19 +0100 |
| commit | dd163e09b582177ce54fae44b63b10579ee0746d (patch) | |
| tree | 80f6341bacc9e62a274231157ec35a5b262f5e24 /package/squid/Makefile | |
| parent | 537a2c4eaa446e52c6ba07007eb9ae75998b5580 (diff) | |
fix make allmodconfig
update several packages, remove snort-wireless.
Diffstat (limited to 'package/squid/Makefile')
| -rw-r--r-- | package/squid/Makefile | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/package/squid/Makefile b/package/squid/Makefile index 807e4dc08..3fb78d66d 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -13,7 +13,8 @@ PKG_SECTION:= net PKG_DEPENDS:= libopenssl libpthread PKG_URL:= http://www.squid-cache.org PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.0/ -PKG_CXX:= SQUID +PKG_MULTI:= 1 +#PKG_CXX:= SQUID AUTH_MODULES:= basic digest ntlm ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},) @@ -74,11 +75,11 @@ $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_grou $(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth)) $(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_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 +#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_STYLE:= autotool gnu CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \ @@ -136,15 +137,12 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \ BUILD_STYLE:= auto INSTALL_STYLE:= auto -ifeq (${ADK_COMPILE_SQUID_WITH_UCLIBCXX},y) +#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-configure: - ${SED} 's#\(hardcode_into_libs=\).*$$#\1no#' \ - ${WRKBUILD}/libtool +#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 |