Date: Sun, 09 Aug 2015 17:41:18 -0700 From: Peter Wemm <peter@wemm.org> To: Gregory Shapiro <gshapiro@gshapiro.net> Cc: Peter Wemm <peter@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r286504 - head/usr.bin/svn/lib/libapr_util Message-ID: <37874686.er3HN7UA1e@overcee.wemm.org> In-Reply-To: <20150810001413.GB69229@minime-2.local> References: <201508090515.t795FTqB068568@repo.freebsd.org> <20150810001413.GB69229@minime-2.local>
next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart4102054.X69gK85sas Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="us-ascii" On Sunday, August 09, 2015 05:14:13 PM Gregory Shapiro wrote: > The change below appears to have broken cross compiling for mips plat= forms > (using freebsd-wifi-build on an amd64 host): >=20 > /home/gshapiro/tplink/src/usr.bin/svn/lib/libapr_util/../../../../con= trib/ap > r-util/xlate/xlate.c:40:19: error: iconv.h: No such file or directory= mkdep: > compile failed > --- .depend --- > *** [.depend] Error code 1 >=20 > make[6]: stopped in /home/gshapiro/tplink/src/usr.bin/svn/lib/libapr_= util >=20 > Setting APU_HAVE_ICONV to 0, undef'ing HAVE_ICONV_H, and preventing > libapr_util/Makefile from turning them back on allowed buildworld to > complete. >=20 > In case it is needed, the host is: >=20 > FreeBSD freebsd.local 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r286285: T= ue Aug=20 > 4 15:12:53 UTC 2015 =20 > root@releng2.nyi.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >=20 > The src checkout is: >=20 > Path: . > Working Copy Root Path: /home/gshapiro/tplink/src > URL: https://svn.freebsd.org/base/head > Relative URL: ^/head > Repository Root: https://svn.freebsd.org/base > Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f > Revision: 286560 > Node Kind: directory > Schedule: normal > Last Changed Author: mav > Last Changed Rev: 286556 > Last Changed Date: 2015-08-09 13:41:44 -0700 (Sun, 09 Aug 2015) Huh. Is this an external tool or something? I take it that it is forc= ing=20 ICONV off? > On Sun, Aug 09, 2015 at 05:15:29AM +0000, Peter Wemm wrote: > > Author: peter > > Date: Sun Aug 9 05:15:28 2015 > > New Revision: 286504 > > URL: https://svnweb.freebsd.org/changeset/base/286504 > >=20 > > Log: > > Update apr-util config - I don't believe this part is used by svn= , but > > if it were, use shm_* instead of sysvshm. > >=20 > > Modified: > > head/usr.bin/svn/lib/libapr_util/apu.h > > head/usr.bin/svn/lib/libapr_util/apu_config.h > >=20 > > Modified: head/usr.bin/svn/lib/libapr_util/apu.h > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > > =3D=3D=3D=3D --- head/usr.bin/svn/lib/libapr_util/apu.h=09Sun Aug = 9 05:14:25 > > 2015=09(r286503) +++ head/usr.bin/svn/lib/libapr_util/apu.h=09Sun A= ug 9 > > 05:15:28 2015=09(r286504) @@ -117,16 +117,12 @@ > >=20 > > #define APU_HAVE_FREETDS 0 > > #define APU_HAVE_ODBC 0 > >=20 > > -#define APU_HAVE_CRYPTO 0 > > -#define APU_HAVE_OPENSSL 0 > > +#define APU_HAVE_CRYPTO 1 > > +#define APU_HAVE_OPENSSL 1 > >=20 > > #define APU_HAVE_NSS 0 > >=20 > > -#ifndef APU_HAVE_APR_ICONV > >=20 > > #define APU_HAVE_APR_ICONV 0 > >=20 > > -#endif > > -#ifndef APU_HAVE_ICONV > > -#define APU_HAVE_ICONV 0 > > -#endif > > +#define APU_HAVE_ICONV 1 > >=20 > > #define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICO= NV) > > =20 > > #endif /* APU_H */ > >=20 > > Modified: head/usr.bin/svn/lib/libapr_util/apu_config.h > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > > =3D=3D=3D=3D --- head/usr.bin/svn/lib/libapr_util/apu_config.h=09Su= n Aug 9=20 05:14:25 > > 2015=09(r286503) +++ head/usr.bin/svn/lib/libapr_util/apu_config.h=09= Sun Aug=20 > > 9 05:15:28 2015=09(r286504) @@ -13,7 +13,7 @@ > >=20 > > /* #undef APU_DSO_LIBDIR */ > > =20 > > /* Define if the inbuf parm to iconv() is const char ** */ > >=20 > > -#define APU_ICONV_INBUF_CONST 1 > > +/* #undef APU_ICONV_INBUF_CONST */ > >=20 > > /* Define that OpenSSL uses const buffers */ > > #define CRYPTO_OPENSSL_CONST_BUFFERS 1 > >=20 > > @@ -41,7 +41,7 @@ > >=20 > > /* #undef HAVE_FREETDS_SYBDB_H */ > > =20 > > /* Define to 1 if you have the <iconv.h> header file. */ > >=20 > > -/* #undef HAVE_ICONV_H */ > > +#define HAVE_ICONV_H 1 > >=20 > > /* Define to 1 if you have the <inttypes.h> header file. */ > > #define HAVE_INTTYPES_H 1 =2D-=20 Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI= 6FJV UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246 --nextPart4102054.X69gK85sas Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABCAAGBQJVx/MuAAoJEDXWlwnsgJ4EepsH/0vcKvR0qbSBc38XOofhNlF/ j/R29hftpMopJWb8BpU2LOzZWVmzArradizj1iuwT320ZK0NGXkA4Nycw6xkfwH5 pWzeNpOob1i1j8PKSoGCp+v7rOqbxRoOu1gNPi+2Hqf0rRGe+tcOQ+H1MWjESu47 tr7QTY4lgNiUa6EAvcdPD3RJxz4HYEL0ivWvt2W8lJocp8Dg21ilTgF2I1xUTP9z 2ALzj9r1GJJjGhXlSjlsm5+HzeHPcwASrrQoy7SE5Hxv3+2GQyaV/OkOjMQ6aCCl f/YNBz+lGFAKTVunxGPLGvn2/qjO6gDvyWsZ54YAHKcUw8YV0Psi32CkgV9HV6U= =HOTZ -----END PGP SIGNATURE----- --nextPart4102054.X69gK85sas--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?37874686.er3HN7UA1e>