From owner-svn-src-head@FreeBSD.ORG Fri Jun 28 09:55:44 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 025B26E5; Fri, 28 Jun 2013 09:55:44 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from outgoing.tormail.org (outgoing.tormail.org [82.221.96.22]) by mx1.freebsd.org (Postfix) with ESMTP id AEF891F0E; Fri, 28 Jun 2013 09:55:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=internal.tormail.org) by outgoing.tormail.org with esmtp (Exim 4.72) (envelope-from ) id 1UsVP3-0008Eo-5R; Fri, 28 Jun 2013 13:55:41 +0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:X-TorMail-User:Content-Type:MIME-Version:References:Date:In-Reply-To:Subject:Cc:To:From; bh=352TnbK4zb50jEWpqNHynf9v3l2UUzZrGl6RZkwfzVc=; b=Ic6egqcrdiJSqL/S5ldDU4NdSOcdrwEUk2JmKj0MFaxHO5djBfh1TVdz3s2xnal4xMm/nK9VwJabnshmvOhDyK08u13HK67j0HIVtWu7IA8QDNlhXu7qfC8rcAcovO59V0ABJtMpiUROTc1TThkKGF1xVmTFqGAgJgjZQJmWbQY=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1UsVLo-0001Tg-LY; Fri, 28 Jun 2013 09:52:21 +0000 From: Jan Beich To: Peter Wemm Subject: Re: svn commit: r251886 - in head: contrib/apr contrib/apr-util contrib/serf contrib/sqlite3 contrib/subversion share/mk usr.bin usr.bin/svn usr.bin/svn/lib usr.bin/svn/lib/libapr usr.bin/svn/lib/libap... In-Reply-To: <201306180253.r5I2rj45053959@svn.freebsd.org> (Peter Wemm's message of "Tue, 18 Jun 2013 02:53:45 +0000 (UTC)") Date: Fri, 28 Jun 2013 11:53:08 +0200 References: <201306180253.r5I2rj45053959@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1UsVLo-0001Tg-LY@internal.tormail.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jun 2013 09:55:44 -0000 Peter Wemm 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 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 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 header file. */ -/* #undef HAVE_ICONV_H */ - /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1