Peter Wemm <pe...@freebsd.org> writes:
> Author: peter
> Date: Tue Jun 18 02:53:45 2013
> New Revision: 251886
> URL: http://svnweb.freebsd.org/changeset/base/251886
>
> Log:
> Introduce svnlite so that we can check out our source code again.
Can you teach apr about WITH_ICONV?
$ svnsync sync file:///freebsd/base
svnsync: E000022: Safe data 'In the Xen block front driver, take advantage of
backends that
support cache flush and write barrier commands.
...
Submitted by: Roger Pau Monn' was followed by non-ASCII byte 195: unable to
convert to/from UTF-8
Exit 1
$ svn info file:///freebsd/base | awk '/^Rev/ { print $2 }'
252259
$ locale | awk -F. '/ctype/I { print $2; exit }'
UTF-8
Not sure why svnsync tries to convert from UTF-8 to UTF-8 only to
fail without iconv().
Index: usr.bin/svn/lib/libapr_util/Makefile
===================================================================
--- usr.bin/svn/lib/libapr_util/Makefile (revision 252337)
+++ usr.bin/svn/lib/libapr_util/Makefile (working copy)
@@ -1,6 +1,7 @@
# $FreeBSD$
.include "${.CURDIR}/../Makefile.inc"
+.include <bsd.own.mk>
INTERNALLIB= yes
LIB= apr-util
@@ -28,5 +29,11 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${APR}/include/arch/unix \
-I${APR}/include
+.if ${MK_ICONV} != "no"
+CFLAGS+= -DHAVE_ICONV_H -DAPU_HAVE_ICONV=1
+.else
+CFLAGS+= -DAPU_HAVE_ICONV=0
+.endif
+
.include <bsd.lib.mk>
Index: usr.bin/svn/lib/libapr_util/apu.h
===================================================================
--- usr.bin/svn/lib/libapr_util/apu.h (revision 252337)
+++ usr.bin/svn/lib/libapr_util/apu.h (working copy)
@@ -85,7 +85,6 @@
#define APU_HAVE_SQLITE2 0
#define APU_HAVE_APR_ICONV 0
-#define APU_HAVE_ICONV 0
#define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
#endif /* APU_H */
Index: usr.bin/svn/lib/libapr_util/apu_config.h
===================================================================
--- usr.bin/svn/lib/libapr_util/apu_config.h (revision 252337)
+++ usr.bin/svn/lib/libapr_util/apu_config.h (working copy)
@@ -24,9 +24,6 @@
/* Define if expat.h is available */
#define HAVE_EXPAT_H 1
-/* Define to 1 if you have the <iconv.h> header file. */
-/* #undef HAVE_ICONV_H */
-
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
