From 971fc297132b9fd2938cd28a75f6689116688101 Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Mon, 19 Dec 2016 13:40:14 +0800 Subject: Revert "subversion: fix "svnadmin create" fail on x86" This reverts commit cfe6f3e251240c9d9a70354be0501600357f0b87. This is because the apr configure wrong, when the apr configure meets the cross compiling, it pass 8 bytes to "off_t", in apr source code configure.in, it was hardcoded: APR_CHECK_SIZEOF_EXTENDED([#include ], off_t, 8) The macro "APR_CHECK_SIZEOF_EXTENDED" was defined in build/apr_common.m4, it use the "AC_TRY_RUN" macro, this macro let the off_t to 8, when cross compiling enable. But in glibc on the x86 or multilib target the "off_t" was 4 bytes, so this cases dismatch for softwares which use the apr.h, such as subversion, run this: svnadmin create test It failed because the "APR_OFF_T_FMT" was "lld" in apr.h when apr configure, but the "apr_off_t" was 4 bytes, in the apr source code: apr_snprintf.c i_quad = va_arg(ap, apr_int64_t); When the function apr_vformatter meets "lld", it would use the above to parse, but the above read 8 bytes, so the follow-up data go to wrong. So we should configure the apr correct when cross compiling. I do this on the following patchs. (From OE-Core rev: fbdfb39c011676fe61a4d58b62226126e0e9ec62) Signed-off-by: Dengke Du Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/subversion/subversion_1.9.5.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'meta/recipes-devtools/subversion/subversion_1.9.5.bb') diff --git a/meta/recipes-devtools/subversion/subversion_1.9.5.bb b/meta/recipes-devtools/subversion/subversion_1.9.5.bb index 575bbca46e..05fba677b0 100644 --- a/meta/recipes-devtools/subversion/subversion_1.9.5.bb +++ b/meta/recipes-devtools/subversion/subversion_1.9.5.bb @@ -14,7 +14,6 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://disable_macos.patch \ file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \ file://0001-Fix-libtool-name-in-configure.ac.patch \ - file://0001-fix-svnadmin-create-fail-on-x86.patch \ file://serfmacro.patch \ " -- cgit v1.2.3-54-g00ecf