mirror of
https://git.yoctoproject.org/poky
synced 2026-03-02 05:19:40 +01:00
971fc29713
This reverts commit cfe6f3e251.
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 <sys/types.h>], 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 <dengke.du@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
56 lines
3.8 KiB
BlitzBasic
56 lines
3.8 KiB
BlitzBasic
SUMMARY = "Subversion (svn) version control system client"
|
|
SECTION = "console/network"
|
|
DEPENDS = "apr-util serf sqlite3 file"
|
|
DEPENDS_append_class-native = " file-replacement-native"
|
|
RDEPENDS_${PN} = "serf"
|
|
LICENSE = "Apache-2"
|
|
HOMEPAGE = "http://subversion.tigris.org"
|
|
|
|
BBCLASSEXTEND = "native"
|
|
|
|
inherit gettext
|
|
|
|
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://serfmacro.patch \
|
|
"
|
|
|
|
SRC_URI[md5sum] = "9fcbae352a5efe73d46a88c97c6bba14"
|
|
SRC_URI[sha256sum] = "8a4fc68aff1d18dcb4dd9e460648d24d9e98657fbed496c582929c6b3ce555e5"
|
|
|
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=af81ae49ba359e70626c05e9bf313709"
|
|
|
|
PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl"
|
|
PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring,--without-gnome-keyring,glib-2.0 gnome-keyring"
|
|
|
|
EXTRA_OECONF = " \
|
|
--without-berkeley-db --without-apxs \
|
|
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
|
|
--with-apr-util=${STAGING_BINDIR_CROSS} \
|
|
--disable-keychain \
|
|
ac_cv_path_RUBY=none"
|
|
|
|
inherit autotools
|
|
|
|
export LDFLAGS += " -L${STAGING_LIBDIR} "
|
|
CPPFLAGS += "-P"
|
|
BUILD_CPPFLAGS += "-P"
|
|
|
|
acpaths = "-I build/ -I build/ac-macros/"
|
|
|
|
do_configure_prepend () {
|
|
rm -f ${S}/libtool
|
|
rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh ${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4 ${S}/build/lt~obsolete.m4
|
|
rm -f ${S}/aclocal.m4
|
|
sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
|
|
}
|
|
|
|
#| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_local/libsvn_ra_local-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_repos/libsvn_repos-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| /usr/bin/ld: cannot find -lsvn_delta-1| collect2: ld returned 1 exit status| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_svn/libsvn_ra_svn-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_serf/libsvn_ra_serf-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'
|
|
#| x86_64-linux-libtool: install: error: relink `libsvn_ra_serf-1.la' with the above command before installing it
|
|
#| x86_64-linux-libtool: install: warning: `../../subversion/libsvn_repos/libsvn_repos-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'
|
|
#| /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/subversion-1.8.9/build-outputs.mk:1090: recipe for target 'install-serf-lib' failed
|
|
#| make: *** [install-serf-lib] Error 1
|
|
PARALLEL_MAKEINST = ""
|