Date: Sun, 9 Aug 2015 17:14:13 -0700 From: Gregory Shapiro <gshapiro@gshapiro.net> To: Peter Wemm <peter@FreeBSD.org> Cc: 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: <20150810001413.GB69229@minime-2.local> In-Reply-To: <201508090515.t795FTqB068568@repo.freebsd.org> References: <201508090515.t795FTqB068568@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
The change below appears to have broken cross compiling for mips platforms (using freebsd-wifi-build on an amd64 host): /home/gshapiro/tplink/src/usr.bin/svn/lib/libapr_util/../../../../contrib/apr-util/xlate/xlate.c:40:19: error: iconv.h: No such file or directory mkdep: compile failed --- .depend --- *** [.depend] Error code 1 make[6]: stopped in /home/gshapiro/tplink/src/usr.bin/svn/lib/libapr_util 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. In case it is needed, the host is: FreeBSD freebsd.local 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r286285: Tue Aug 4 15:12:53 UTC 2015 root@releng2.nyi.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 The src checkout is: 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) 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 > > Log: > Update apr-util config - I don't believe this part is used by svn, but > if it were, use shm_* instead of sysvshm. > > Modified: > head/usr.bin/svn/lib/libapr_util/apu.h > head/usr.bin/svn/lib/libapr_util/apu_config.h > > Modified: head/usr.bin/svn/lib/libapr_util/apu.h > ============================================================================== > --- head/usr.bin/svn/lib/libapr_util/apu.h Sun Aug 9 05:14:25 2015 (r286503) > +++ head/usr.bin/svn/lib/libapr_util/apu.h Sun Aug 9 05:15:28 2015 (r286504) > @@ -117,16 +117,12 @@ > #define APU_HAVE_FREETDS 0 > #define APU_HAVE_ODBC 0 > > -#define APU_HAVE_CRYPTO 0 > -#define APU_HAVE_OPENSSL 0 > +#define APU_HAVE_CRYPTO 1 > +#define APU_HAVE_OPENSSL 1 > #define APU_HAVE_NSS 0 > > -#ifndef APU_HAVE_APR_ICONV > #define APU_HAVE_APR_ICONV 0 > -#endif > -#ifndef APU_HAVE_ICONV > -#define APU_HAVE_ICONV 0 > -#endif > +#define APU_HAVE_ICONV 1 > #define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV) > > #endif /* APU_H */ > > Modified: head/usr.bin/svn/lib/libapr_util/apu_config.h > ============================================================================== > --- head/usr.bin/svn/lib/libapr_util/apu_config.h Sun Aug 9 05:14:25 2015 (r286503) > +++ head/usr.bin/svn/lib/libapr_util/apu_config.h Sun Aug 9 05:15:28 2015 (r286504) > @@ -13,7 +13,7 @@ > /* #undef APU_DSO_LIBDIR */ > > /* Define if the inbuf parm to iconv() is const char ** */ > -#define APU_ICONV_INBUF_CONST 1 > +/* #undef APU_ICONV_INBUF_CONST */ > > /* Define that OpenSSL uses const buffers */ > #define CRYPTO_OPENSSL_CONST_BUFFERS 1 > @@ -41,7 +41,7 @@ > /* #undef HAVE_FREETDS_SYBDB_H */ > > /* Define to 1 if you have the <iconv.h> header file. */ > -/* #undef HAVE_ICONV_H */ > +#define HAVE_ICONV_H 1 > > /* Define to 1 if you have the <inttypes.h> header file. */ > #define HAVE_INTTYPES_H 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150810001413.GB69229>