Date: Mon, 11 Nov 2013 13:46:01 +0100 From: Dimitry Andric <dim@FreeBSD.org> To: Johan Hendriks <joh.hendriks@gmail.com> Cc: FreeBSD <freebsd-ports@freebsd.org> Subject: Re: www/squid32 on 10-beta3 Message-ID: <EE3AE9B3-1F91-4838-826E-8DA9837E08ED@FreeBSD.org> In-Reply-To: <52809901.1040900@gmail.com> References: <52809901.1040900@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_5D0C090F-03CA-4AD3-B8EA-CC07ED319E73
Content-Type: multipart/mixed;
boundary="Apple-Mail=_1B78168C-A5AB-4630-8283-C2D83AAC3E94"
--Apple-Mail=_1B78168C-A5AB-4630-8283-C2D83AAC3E94
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=us-ascii
On 11 Nov 2013, at 09:44, Johan Hendriks <joh.hendriks@gmail.com> wrote:
> I try to install www/squid32 on my FreeBSD 10-BETA3 server, but it =
fails with the following error.
>=20
> Making all in base
> /bin/sh ../../libtool --tag=3DCXX --mode=3Dcompile c++ =
-DHAVE_CONFIG_H -I../.. -I../../include -I../../lib -I../../src =
-I../../include -I/usr/include -I/usr/include -I../../libltdl =
-I/usr/include -I/usr/include -O2 -pipe -march=3Dcore2 =
-fno-strict-aliasing -Wno-unused-private-field -I/usr/local/include -MT =
AsyncCall.lo -MD -MP -MF .deps/AsyncCall.Tpo -c -o AsyncCall.lo =
AsyncCall.cc
> libtool: compile: c++ -DHAVE_CONFIG_H -I../.. -I../../include =
-I../../lib -I../../src -I../../include -I/usr/include -I/usr/include =
-I../../libltdl -I/usr/include -I/usr/include -O2 -pipe -march=3Dcore2 =
-fno-strict-aliasing -Wno-unused-private-field -I/usr/local/include -MT =
AsyncCall.lo -MD -MP -MF .deps/AsyncCall.Tpo -c AsyncCall.cc -fPIC =
-DPIC -o .libs/AsyncCall.o
> In file included from AsyncCall.cc:5:
> In file included from ../../src/squid-old.h:164:
> In file included from ../../src/typedefs.h:118:
> In file included from ../../src/anyp/ProtocolType.h:5:
> In file included from /usr/include/c++/v1/ostream:130:
> In file included from /usr/include/c++/v1/ios:216:
> In file included from /usr/include/c++/v1/__locale:15:
> In file included from /usr/include/c++/v1/string:432:
> /usr/include/c++/v1/cstdio:139:9: error: no member named
> 'ERROR_sprintf_UNSAFE_IN_SQUID' in the global namespace
> using ::sprintf;
> ~~^
> ../../compat/unsafe.h:10:17: note: expanded from macro 'sprintf'
> #define sprintf ERROR_sprintf_UNSAFE_IN_SQUID
> ^
> 1 error generated.
Please try the attached patch. I already posted a similar patch for =
squid33.
-Dimitry
--Apple-Mail=_1B78168C-A5AB-4630-8283-C2D83AAC3E94
Content-Disposition: attachment;
filename=www__squid32-fix-cstdio-1.diff
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="www__squid32-fix-cstdio-1.diff"
Content-Transfer-Encoding: 7bit
Index: www/squid32/files/patch-compat-stdio.h
===================================================================
--- www/squid32/files/patch-compat-stdio.h (revision 0)
+++ www/squid32/files/patch-compat-stdio.h (working copy)
@@ -0,0 +1,11 @@
+--- compat/stdio.h.orig 2013-07-13 15:22:32.000000000 +0200
++++ compat/stdio.h 2013-11-11 12:56:24.000000000 +0100
+@@ -46,7 +46,7 @@
+ #endif /* __USE_FILE_OFFSET64 && !__REDIRECT */
+
+ // Finally import the <cstdio> stuff we actually use
+-#if HAVE_CSTDIO
++#if defined(__cplusplus) && HAVE_CSTDIO
+ #include<cstdio>
+ #endif
+
Index: www/squid32/files/patch-configure
===================================================================
--- www/squid32/files/patch-configure (revision 333486)
+++ www/squid32/files/patch-configure (working copy)
@@ -1,5 +1,14 @@
--- configure.orig 2012-10-21 18:10:03.000000000 +0200
+++ configure 2012-10-21 18:27:39.000000000 +0200
+@@ -18416,7 +18416,7 @@
+ GCCVER2=`echo $GCCVER | awk '{print $1 * 100}'`
+ case "$host" in
+ i386-*-freebsd*)
+- if test $GCCVER2 -lt 300 ; then
++ if test "x$GCCVER" != x -a $GCCVER2 -lt 300 ; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "GCC $GCCVER causes a coredump on $host.
@@ -22154,7 +22154,7 @@
done
@@ -45,3 +54,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lkrb5" >&5
$as_echo_n "checking for error_message in -lkrb5... " >&6; }
if ${ac_cv_lib_krb5_error_message+:} false; then :
+@@ -24033,6 +24033,7 @@
+ cassert \
+ crypt.h \
+ cstdarg \
++ cstdio \
+ cstdlib \
+ cstring \
+ list \
Index: www/squid32/files/patch-include-Array.h
===================================================================
--- www/squid32/files/patch-include-Array.h (revision 0)
+++ www/squid32/files/patch-include-Array.h (working copy)
@@ -0,0 +1,33 @@
+--- include/Array.h.orig 2013-07-13 15:22:32.000000000 +0200
++++ include/Array.h 2013-11-11 13:32:43.000000000 +0100
+@@ -44,12 +44,19 @@
+ #include "compat/assert.h"
+
+ /* iterator support */
++#include <iterator>
+
+ template <class C>
+ class VectorIteratorBase
+ {
+
+ public:
++ typedef typename C::value_type value_type;
++ typedef std::forward_iterator_tag iterator_category;
++ typedef typename C::pointer pointer;
++ typedef typename C::reference reference;
++ typedef typename C::difference_type difference_type;
++
+ VectorIteratorBase();
+ VectorIteratorBase(C &);
+ VectorIteratorBase(size_t, C &);
+@@ -81,8 +88,10 @@
+ public:
+ typedef E value_type;
+ typedef E* pointer;
++ typedef E& reference;
+ typedef VectorIteratorBase<Vector<E> > iterator;
+ typedef VectorIteratorBase<Vector<E> const> const_iterator;
++ typedef ptrdiff_t difference_type;
+
+ void *operator new (size_t);
+ void operator delete (void *);
Index: www/squid32/files/patch-include-autoconf.h.in
===================================================================
--- www/squid32/files/patch-include-autoconf.h.in (revision 0)
+++ www/squid32/files/patch-include-autoconf.h.in (working copy)
@@ -0,0 +1,12 @@
+--- include/autoconf.h.in.orig 2013-07-13 15:22:53.000000000 +0200
++++ include/autoconf.h.in 2013-11-11 13:04:46.000000000 +0100
+@@ -151,6 +151,9 @@
+ /* Define to 1 if you have the <cstdarg> header file. */
+ #undef HAVE_CSTDARG
+
++/* Define to 1 if you have the <cstdio> header file. */
++#undef HAVE_CSTDIO
++
+ /* Define to 1 if you have the <cstdlib> header file. */
+ #undef HAVE_CSTDLIB
+
--Apple-Mail=_1B78168C-A5AB-4630-8283-C2D83AAC3E94
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=us-ascii
--Apple-Mail=_1B78168C-A5AB-4630-8283-C2D83AAC3E94--
--Apple-Mail=_5D0C090F-03CA-4AD3-B8EA-CC07ED319E73
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename=signature.asc
Content-Type: application/pgp-signature;
name=signature.asc
Content-Description: Message signed with OpenPGP using GPGMail
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
iEYEARECAAYFAlKA0Y0ACgkQsF6jCi4glqOUCgCgtuQFStAgW7JeBWBPMhaqzVMj
R5QAnjSdZg5i9qHbd1mWmwGnR9qVozYP
=BNpZ
-----END PGP SIGNATURE-----
--Apple-Mail=_5D0C090F-03CA-4AD3-B8EA-CC07ED319E73--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?EE3AE9B3-1F91-4838-826E-8DA9837E08ED>