diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-11-27 19:33:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-11-27 19:33:58 +0100 |
| commit | 3d8d90f636eb9e1c7c89b3f99841948b6c30050c (patch) | |
| tree | 4903e6ce7f4174e5e80ee3bd585b9af9d94c2255 /package/squid | |
| parent | 0c6fb98d013e4ffc664935a51adce94254d10f83 (diff) | |
| parent | 7d36caec53dbfeea4e696205ae71bdae8246a082 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/squid')
| -rw-r--r-- | package/squid/Config.in | 1 | ||||
| -rw-r--r-- | package/squid/Makefile | 13 |
2 files changed, 14 insertions, 0 deletions
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 \ |