From 83f5e16fffe029232114ee9f54b8df41d5841912 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 25 Nov 2009 23:02:27 +0100
Subject: add update script to base-files

- system update via http/ftp/ssh/file possible
- add bridge script
- cleanup unused files
---
 package/squid/Config.in |  1 +
 package/squid/Makefile  | 13 +++++++++++++
 2 files changed, 14 insertions(+)

(limited to 'package/squid')

diff --git a/package/squid/Config.in b/package/squid/Config.in
index 86813dfd6..c0cc8f818 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -26,6 +26,7 @@ config ADK_COMPILE_SQUID_WITH_STDCXX
 config ADK_COMPILE_SQUID_WITH_UCLIBCXX
         bool "Embedded uClibc++ library"
         select ADK_PACKAGE_UCLIBCXX
+	depends on ADK_BROKEN
         help
 
 endchoice
diff --git a/package/squid/Makefile b/package/squid/Makefile
index cb7a51494..80f97c032 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -78,6 +78,12 @@ $(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
+
 CONFIGURE_STYLE:=	autotool gnu
 CONFIGURE_ENV+=		ac_cv_sizeof_void_p=4 \
 			ac_cv_sizeof_short=2 \
@@ -134,6 +140,13 @@ CONFIGURE_ARGS+=	--datadir=/usr/share/squid \
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
+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 \
-- 
cgit v1.2.3